diff --git a/test_suite.sh b/test_suite.sh
index 6a30a4318e..de1c64d977 100755
--- a/test_suite.sh
+++ b/test_suite.sh
@@ -203,14 +203,10 @@ echo "Detected available memory: ${cgroup_mem_mib} MiB"
 
 # echo "Replacing detected system information in template ReFrame config file..."
 cp ${RFM_CONFIG_FILE_TEMPLATE} ${RFM_CONFIG_FILES}
-# sed -i "s/__NUM_CPUS__/${cpu_count}/g" $RFM_CONFIG_FILES
-# sed -i "s/__NUM_SOCKETS__/${socket_count}/g" $RFM_CONFIG_FILES
-# sed -i "s/__NUM_CPUS_PER_CORE__/${threads_per_core}/g" $RFM_CONFIG_FILES
-# sed -i "s/__NUM_CPUS_PER_SOCKET__/${cores_per_socket}/g" $RFM_CONFIG_FILES
+echo "Replacing memory limit in the ReFrame config file with the detected CGROUP memory limit: ${cgroup_mem_mib} MiB"
 sed -i "s/__MEM_PER_NODE__/${cgroup_mem_mib}/g" $RFM_CONFIG_FILES
-echo "Replacing partition name in the template ReFrame config file, to trigger CPU autodetection for this job"
-# cp ${RFM_CONFIG_FILE_TEMPLATE} ${RFM_CONFIG_FILES}
 RFM_PARTITION="${SLURM_JOB_PARTITION}"
+echo "Replacing partition name in the template ReFrame config file: ${RFM_PARTITION}"
 sed -i "s/__RFM_PARTITION__/${RFM_PARTITION}/g" $RFM_CONFIG_FILES
 
 # Make debugging easier by printing the final config file: