diff --git a/testsuite/expect/globals b/testsuite/expect/globals
index a8a98d70b1488ba0915d386df978a110fff7af13..4670fb0a153c48c91701fbc3600477b59646b252 100755
--- a/testsuite/expect/globals
+++ b/testsuite/expect/globals
@@ -2995,6 +2995,43 @@ proc slurmctld_plug_stack_nonstop { } {
 	return $nonstop_enforce
 }
 
+################################################################
+#
+# Proc: job_submit_all_partitions
+#
+# Purpose: Use scontrol to determine if the JobSubmitPlugins
+#          includes "all_partitions".
+#
+# Returns: 1 if the value is set to nonstop.
+#
+################################################################
+
+proc job_submit_all_partitions { } {
+	global scontrol alpha_numeric_comma
+
+	log_user 0
+	set all_partitions 0
+	set scon_pid [spawn -noecho $scontrol show config]
+	expect {
+		-re "JobSubmitPlugins *= ($alpha_numeric_comma)" {
+			if {[string first $expect_out(1,string) "all_partitions"] != -1} {
+				set all_partitions 1
+			}
+			exp_continue
+		}
+		timeout {
+			send_user "\nFAILURE: scontrol not responding\n"
+			slow_kill $scon_pid
+			set exit_code 1
+		}
+		eof {
+			wait
+		}
+	}
+	log_user 1
+	return $all_partitions
+}
+
 ################################################################
 #
 # Proc: wait_for_node
diff --git a/testsuite/expect/test5.6 b/testsuite/expect/test5.6
index 080003e0b8f72ecc16211347db14b0ca8048815e..f0f7c0505fd0edc2ddd4f56d860e3d36b717f51b 100755
--- a/testsuite/expect/test5.6
+++ b/testsuite/expect/test5.6
@@ -43,6 +43,11 @@ set job_name2    "test$test_id.job2"
 
 print_header $test_id
 
+if {[job_submit_all_partitions] != 0} {
+	send_user "\nWARNING: This test is incompatable with JobSubmitPlugins=all_partitions\n"
+	exit 0
+}
+
 if {[test_launch_poe]} {
 	set step_id 1
 } else {
diff --git a/testsuite/expect/test6.10 b/testsuite/expect/test6.10
index b6bec205c25675e8057cb7c7ab65d4602b04f2d9..10a6b463e6db682594a951067ab5f13a695d9de7 100755
--- a/testsuite/expect/test6.10
+++ b/testsuite/expect/test6.10
@@ -44,6 +44,11 @@ set job_id        0
 
 print_header $test_id
 
+if {[job_submit_all_partitions] != 0} {
+	send_user "\nWARNING: This test is incompatable with JobSubmitPlugins=all_partitions\n"
+	exit 0
+}
+
 #
 # Execute 'id' to determine my login name
 #
@@ -93,7 +98,6 @@ if {$job_id == 0} {
 	send_user "\nFAILURE: batch submit failure\n"
 	exit 1
 }
-exec $bin_rm -f $file_in
 
 #
 # Identify this job's parition
@@ -186,13 +190,13 @@ expect {
 		wait
 	}
 }
-
 if {$matches != 0} {
 	send_user "\nFAILURE: scancel user filter failed\n"
 	set exit_code 1
 }
 
 if {$exit_code == 0} {
+	exec $bin_rm -f $file_in
 	send_user "\nSUCCESS\n"
 }
 exit $exit_code