diff --git a/testsuite/expect/test17.38 b/testsuite/expect/test17.38
index 8de1b683d671770f10d063bbe8fbf70e71f119cf..fc0b8d33b05972abf1209ea6d42c81157b5ccc63 100755
--- a/testsuite/expect/test17.38
+++ b/testsuite/expect/test17.38
@@ -56,7 +56,7 @@ function gettime \{
 echo \"starting...\"
 T=\"$\(date +%s)\"
 trap \"echo Got SIGINT 2; gettime; exit 1\" 2
-$srun $file_prog &
+$srun ./$file_prog &
 while :
 do
 	:
diff --git a/testsuite/expect/test32.7 b/testsuite/expect/test32.7
index 91db629541f9002172f293a9395fd02cee3a8fc6..8ebe448c1c7196fc3899fc91b0074adf07ad1863 100755
--- a/testsuite/expect/test32.7
+++ b/testsuite/expect/test32.7
@@ -127,7 +127,7 @@ if {$exit_code == 0} {
 	exec $bin_rm -f $file_in $file_out
 	send_user "\nSUCCESS\n"
 } elseif {[test_launch_poe]} {
-	send_user "\nWARNING: Sporatic failures with POE are expected. Please retest.\n"
+	send_user "\nWARNING: Frequent failures with POE are expected due. Please retest.\n"
 #	POE BUG: If the application exits immediately then pmdv12 hangs until
 #	slurm kills it with a timeout, thus the sleep below is required:
 #	F S   UID   PID  PPID  C PRI  NI ADDR SZ WCHAN TTY   TIME CMD
diff --git a/testsuite/expect/test5.9 b/testsuite/expect/test5.9
index 6fc29a91a14e950b859c21d2d68b189367305e67..84e86b5124455348d1cda585c463d7d09e804b9b 100755
--- a/testsuite/expect/test5.9
+++ b/testsuite/expect/test5.9
@@ -104,6 +104,12 @@ if {$available < 2} {
     exit $exit_code
 }
 
+if {[test_launch_poe]} {
+	set step_id 1
+} else {
+	set step_id 0
+}
+
 remove_acct [get_cluster_name] $test_acct
 
 # Run a job to get a usable node to test
@@ -356,7 +362,7 @@ if {$match != 1} {
 # jobid
 set sq_step_format(jobid)       $job_id
 # stepid
-set sq_step_format(stepid)      $job_id.0
+set sq_step_format(stepid)      $job_id.$step_id
 # stepname
 set sq_step_format(stepname)    "sleep"
 # state
diff --git a/testsuite/expect/test7.12 b/testsuite/expect/test7.12
index 502a95f6765c8a568ad111610e25d0d7db90383e..4cff160e0da275e2634812610083245c186729f9 100755
--- a/testsuite/expect/test7.12
+++ b/testsuite/expect/test7.12
@@ -48,6 +48,14 @@ if {[test_front_end] != 0} {
         exit 0
 }
 
+if {[test_launch_poe]} {
+	set step_id   1
+	set pid_count 2
+} else {
+	set step_id   0
+	set pid_count 1
+}
+
 #
 # Delete left-over program and rebuild it
 #
@@ -115,7 +123,7 @@ if {$debug} {
 set job_matches  0
 set pid_matches  0
 set step_matches 0
-spawn ./$test_prog $job_id
+spawn ./$test_prog $job_id $step_id
 expect {
 	-re "job_id:$job_id step_id" {
 		incr step_matches
@@ -143,13 +151,14 @@ if {$step_matches != 1} {
 	send_user "\nFAILURE: error running slurm_job_step_stat() program ($step_matches != 1)\n"
 	set exit_code 1
 }
-if {$pid_matches != 1} {
-	send_user "\nWARNING: Failed to load PIDs associated with job step ($pid_matches != 1).\n"
+if {$pid_matches != $pid_count} {
+	send_user "\nWARNING: Failed to load PIDs associated with job step ($pid_matches != $pid_count).\n"
 	send_user "         This is dependent upon the ProctrackType configured.\n"
 	send_user "         proctrack/pgid does NOT support this functionality.\n"
 }
 if {$job_matches != 1} {
 	send_user "\nFAILURE: Failed to load job info for this job ($job_matches != 1).\n"
+	set exit_code 1
 }
 
 cancel_job $job_id
diff --git a/testsuite/expect/test7.12.prog.c b/testsuite/expect/test7.12.prog.c
index 28180c19ed9e7be74f58011c9793a82d8e678bf1..f88e4b37cb1de746a41571f533438563c777f1e3 100644
--- a/testsuite/expect/test7.12.prog.c
+++ b/testsuite/expect/test7.12.prog.c
@@ -40,13 +40,12 @@ main(int argc, char **argv)
 	job_info_msg_t *job_info_msg;
 	slurm_job_info_t *job_ptr;
 
-	if (argc < 2) {
-		printf("Usage: job_id [step_id]\n");
+	if (argc < 3) {
+		printf("Usage: job_id step_id\n");
 		exit(1);
 	}
 	job_id = atoi(argv[1]);
-	if (argc > 2)
-		step_id = atoi(argv[2]);
+	step_id = atoi(argv[2]);
 	printf("job_id:%u step_id:%u\n", job_id, step_id);
 
 	rc = slurm_job_step_stat(job_id, step_id, NULL, &resp);