diff --git a/testsuite/expect/globals_federation b/testsuite/expect/globals_federation
index ea6415440d82ed06a96080b2f9061c81fd800d5e..8980111a96e7e1f6170d78575100a8bc6b3f7cc0 100644
--- a/testsuite/expect/globals_federation
+++ b/testsuite/expect/globals_federation
@@ -492,7 +492,7 @@ proc wait_for_fed_job { job_id desired_state clusters } {
 	while 1 {
 		foreach cluster $spec_clusters {
 			log_info "checking $cluster"
-			set fd [open "|$scontrol -M$cluster -a -o show job $job_id"]
+			set fd [open "|$scontrol -M$cluster --local -a -o show job $job_id"]
 			gets $fd line
 			catch {close $fd}
 			if {[regexp {JobState\s*=\s*(\w+)} $line foo state] != 1} {
diff --git a/testsuite/expect/test37.4 b/testsuite/expect/test37.4
index 5d3d362c4da9e621d5bfec07f5bb3ce406011c9e..73bf56b79d48cb12dbd92e82259f7ee82b4b28db 100755
--- a/testsuite/expect/test37.4
+++ b/testsuite/expect/test37.4
@@ -268,7 +268,7 @@ proc validate_fed_job { cname job_id expected_origin expected_sib submit_cluster
 	if {$submit_cluster ne ""} {
 		set my_squeue "${fed_slurm_base}/$submit_cluster/bin/squeue"
 	}
-	spawn $my_squeue --jobs=$job_id --noheader -Oorigin,siblingsactive -a
+	spawn $my_squeue -a --local --jobs=$job_id --noheader -Oorigin,siblingsactive
 	expect {
 		-re "(\\S+)\\s+(\\S+)" {
 			set origin  $expect_out(1,string)
@@ -295,7 +295,7 @@ proc validate_fed_job { cname job_id expected_origin expected_sib submit_cluster
 			continue
 		}
 		set my_squeue "${fed_slurm_base}/$tmp_sib/bin/squeue"
-		spawn $my_squeue --jobs=$job_id --noheader -Oorigin,siblingsactive
+		spawn $my_squeue -a --local --jobs=$job_id --noheader -Oorigin,siblingsactive
 		set match 0
 		expect {
 			-re "(\\S+)\\s+(\\S+)" {
diff --git a/testsuite/expect/test37.5 b/testsuite/expect/test37.5
index 9e7cea4aeb3a35d4fdcafc049db27c3f26c14602..dd4928308a08a57e04646718c56967e8655fc8c9 100755
--- a/testsuite/expect/test37.5
+++ b/testsuite/expect/test37.5
@@ -122,7 +122,7 @@ proc check_ctl_state { job_id state cluster } {
 	global scontrol
 
 	set job_state 0
-	spawn $scontrol -M$cluster show job $job_id -a
+	spawn $scontrol -M$cluster -a --local show job $job_id
 	expect {
 		-re "JobState=$state" {
 			set job_state 1
@@ -147,7 +147,7 @@ proc check_missing_job { job_id cluster } {
 	global scontrol
 
 	set matched 0
-	spawn $scontrol -M$cluster show job $job_id -a
+	spawn $scontrol -M$cluster -a --local show job $job_id
 	expect {
 		"slurm_load_jobs error: Invalid job id specified" {
 			set matched 1
@@ -268,7 +268,7 @@ proc check_hold { job } {
 	global scontrol number exit_code
 
 	set matches 0
-	spawn $scontrol show job $job
+	spawn $scontrol -a --local show job $job
 	expect {
 		"Priority=0" {
 			incr matches
@@ -298,7 +298,7 @@ proc check_exit_hold { job } {
 	global scontrol number exit_code
 
 	set matches 0
-	spawn $scontrol show job $job
+	spawn $scontrol -a --local show job $job
 	expect {
 		"Priority=0" {
 			incr matches
diff --git a/testsuite/expect/test37.6 b/testsuite/expect/test37.6
index 8c01d4dbfae0bcce853d3a23556bbb862089a3e2..a8c4a2b24ad3fbcd5cbcd0cba2f707edd3a8998e 100755
--- a/testsuite/expect/test37.6
+++ b/testsuite/expect/test37.6
@@ -162,7 +162,7 @@ proc verify {fed job_id pattern error_message} {
 
 	set matches 0
 	set my_squeue "${fed_slurm_base}/$fed/bin/squeue"
-	spawn $my_squeue -j $job_id --noheader \
+	spawn $my_squeue -a --local -j $job_id --noheader \
 		-Ostatecompact:.5,siblingsviable:.20,siblingsactive:.20
 	expect {
 		-re "\\s+$pattern" {