diff --git a/testsuite/expect/test12.2 b/testsuite/expect/test12.2
index b232a4d228298df37bd4d7b7b9974de0bcb649c3..b79789c53759dc08b322d90ab1d18f4fc6a5eca9 100755
--- a/testsuite/expect/test12.2
+++ b/testsuite/expect/test12.2
@@ -55,7 +55,7 @@ if {[test_front_end]} {
 }
 
 if {[test_launch_poe]} {
-#	Allow memory for the pmd process
+#	Allow extra time and memory for the POE process
 	set max_time_error 10
 	set max_mem_error  140000
 	set step_id        1
@@ -197,7 +197,8 @@ make_bash_script $file_in "
 #
 set config_prob 0
 set timeout [expr $max_job_delay + $sleep_time]
-set sbatch_pid [spawn $sbatch --mem-per-cpu=1024 --output=$file_out --error=$file_err -t2 $file_in]
+set job_mem_limit [expr ($mem_size + $max_mem_error)  / 1024 + 1]
+set sbatch_pid [spawn $sbatch --mem-per-cpu=$job_mem_limit --output=$file_out --error=$file_err -t2 $file_in]
 expect {
 	-re "Requested node configuration is not available" {
 		set config_prob 1
diff --git a/testsuite/expect/test12.2.prog.c b/testsuite/expect/test12.2.prog.c
index f7f738ca0bdd1941aa4223fe5047e21e61593dd1..515c256ae61835553f05e8d8d7bf3019d74ffdf3 100644
--- a/testsuite/expect/test12.2.prog.c
+++ b/testsuite/expect/test12.2.prog.c
@@ -47,8 +47,8 @@ main (int argc, char **argv)
 	mem_kb     = atoi(argv[3]);
 
 	mem = malloc(mem_kb * 1024);
-	/* need to do a memset on the memory or AIX will not give it
-	 * to me!
+	/* need to do a memset on the memory or AIX will not count
+	 * the memory in the job step's Resident Set Size
 	 */
 	memset(mem, 0, (mem_kb * 1024));
 	sleep(sleep_time);