diff --git a/testsuite/expect/test1.82 b/testsuite/expect/test1.82
index 2fb6131e9135ae30491e415e7662c9cac52598d4..84616961be0fa7b77ae17c509ff58e587d320525 100755
--- a/testsuite/expect/test1.82
+++ b/testsuite/expect/test1.82
@@ -64,7 +64,7 @@ if {$available < $node_cnt} {
     exit $exit_code
 }
 
-set srun_pid [spawn $srun -N$node_cnt -l -t1 $bin_hostname]
+set srun_pid [spawn $srun -N$node_cnt -l -t1 $bin_printenv SLURMD_NODENAME]
 expect {
 	-re "More ($alpha) requested than permitted" {
 		send_user "\nWARNING: can't test srun task distribution\n"
@@ -146,7 +146,7 @@ set host_0      ""
 set host_1      ""
 set host_2      ""
 set timeout $max_job_delay
-set srun_pid [spawn $srun -N2 -l --exclude=$exclude_node -t1 $bin_hostname]  
+set srun_pid [spawn $srun -N2 -l --exclude=$exclude_node -t1 $bin_printenv SLURMD_NODENAME]  
 expect {
 	-re "Invalid node name specified" {
 		send_user "\nWARNING: Appears you are using "
@@ -210,7 +210,7 @@ if {$dup_hostname == 1} {
 set host_0      ""
 set host_1      ""
 set timeout $max_job_delay
-set srun_pid [spawn $srun -N1 -l --nodelist=$include_node -t1 $bin_hostname]
+set srun_pid [spawn $srun -N1 -l --nodelist=$include_node -t1 $bin_printenv SLURMD_NODENAME]
 expect {
 	-re "($number): ($alpha_numeric)" {
 		if {$expect_out(1,string) == 0} {
diff --git a/testsuite/expect/test15.20 b/testsuite/expect/test15.20
index bbc4fa090491b41261001f1526c93bf86f8e7fcd..567ff05084d72eb93da855ab5ea9ae270710dd76 100755
--- a/testsuite/expect/test15.20
+++ b/testsuite/expect/test15.20
@@ -65,7 +65,7 @@ if {$available < $node_cnt} {
     exit $exit_code
 }
 
-set salloc_pid [spawn $salloc -N$node_cnt -t1 $slaunch -l $bin_hostname]
+set salloc_pid [spawn $salloc -N$node_cnt -t1 $slaunch -l $bin_printenv SLURMD_NODENAME]
 expect {
 	-re "Granted job allocation ($number)" {
 		set job_id $expect_out(1,string)
@@ -155,7 +155,7 @@ set host_1      ""
 set host_2      ""
 set job_id      0
 set timeout $max_job_delay
-set salloc_pid [spawn $salloc -N2 -t1 --exclude=$exclude_node $slaunch -l $bin_hostname]
+set salloc_pid [spawn $salloc -N2 -t1 --exclude=$exclude_node $slaunch -l $bin_printenv SLURMD_NODENAME]
 expect {
 	-re "Granted job allocation ($number)" {
 		set job_id $expect_out(1,string)
@@ -227,7 +227,7 @@ set host_0      ""
 set host_1      ""
 set job_id      0
 set timeout $max_job_delay
-set salloc_pid [spawn $salloc -N1 -t1 --nodelist=$include_node $slaunch -l $bin_hostname]
+set salloc_pid [spawn $salloc -N1 -t1 --nodelist=$include_node $slaunch -l $bin_printenv SLURMD_NODENAME]
 expect {
 	-re "Granted job allocation ($number)" {
 		set job_id $expect_out(1,string)
diff --git a/testsuite/expect/test18.31 b/testsuite/expect/test18.31
index b8d1eb7b71948e247f356aecc7eb8274a8691135..c7088231b7ae3cf6b1592c743f19dbe42bf784e6 100755
--- a/testsuite/expect/test18.31
+++ b/testsuite/expect/test18.31
@@ -66,7 +66,7 @@ set host_2      ""
 set host_3      ""
 set job_id      0
 set timeout $max_job_delay
-set salloc_pid [spawn $salloc -N$node_cnt -t1 $slaunch -l $bin_hostname]  
+set salloc_pid [spawn $salloc -N$node_cnt -t1 $slaunch -l $bin_printenv SLURMD_NODENAME]  
 expect {
 	-re "Granted job allocation ($number)" {
 		set job_id $expect_out(1,string)
@@ -152,7 +152,7 @@ set host_1      ""
 set host_2      ""
 set job_id      0
 set timeout $max_job_delay
-set salloc_pid [spawn $salloc -N$node_cnt -t1 --nodelist=$all_nodes $slaunch -N2 --relative=1 -l $bin_hostname]  
+set salloc_pid [spawn $salloc -N$node_cnt -t1 --nodelist=$all_nodes $slaunch -N2 --relative=1 -l $bin_printenv SLURMD_NODENAME]  
 expect {
 	-re "Granted job allocation ($number)" {
 		set job_id $expect_out(1,string)
@@ -224,7 +224,7 @@ set host_0      ""
 set host_1      ""
 set job_id      0
 set timeout $max_job_delay
-set salloc_pid [spawn $salloc -N$node_cnt --nodelist=$all_nodes -t1  $slaunch -N1 --nodelist-byname=$include_node -l $bin_hostname]
+set salloc_pid [spawn $salloc -N$node_cnt --nodelist=$all_nodes -t1  $slaunch -N1 --nodelist-byname=$include_node -l $bin_printenv SLURMD_NODENAME]
 expect {
 	-re "Granted job allocation ($number)" {
 		set job_id $expect_out(1,string)
@@ -279,7 +279,7 @@ set host_0      ""
 set host_1      ""
 set job_id      0
 set timeout $max_job_delay
-set salloc_pid [spawn $salloc -N$node_cnt --nodelist=$all_nodes -t1  $slaunch -N1 --nodelist-byid=2 -l $bin_hostname]  
+set salloc_pid [spawn $salloc -N$node_cnt --nodelist=$all_nodes -t1  $slaunch -N1 --nodelist-byid=2 -l $bin_printenv SLURMD_NODENAME]  
 expect {
 	-re "Granted job allocation ($number)" {
 		set job_id $expect_out(1,string)
diff --git a/testsuite/expect/test18.35 b/testsuite/expect/test18.35
index 9ef21a6057df7560a75a538291f3f90134860131..5eb9a5e843dc04b0b843b53b9c63f9861cf70502 100755
--- a/testsuite/expect/test18.35
+++ b/testsuite/expect/test18.35
@@ -67,7 +67,7 @@ set host_2      ""
 set host_3      ""
 set job_id      0
 set timeout $max_job_delay
-set salloc_pid [spawn $salloc -N$node_cnt -t1 $slaunch -l $bin_hostname]  
+set salloc_pid [spawn $salloc -N$node_cnt -t1 $slaunch -l $bin_printenv SLURMD_NODENAME]  
 expect {
 	-re "Granted job allocation ($number)" {
 		set job_id $expect_out(1,string)
@@ -238,7 +238,7 @@ set host_0      ""
 set host_1      ""
 set job_id      0
 set timeout $max_job_delay
-set salloc_pid [spawn $salloc -N$node_cnt --nodelist=$all_nodes -t1  $slaunch -n1 --task-layout-byname=$include_node -l $bin_hostname]  
+set salloc_pid [spawn $salloc -N$node_cnt --nodelist=$all_nodes -t1  $slaunch -n1 --task-layout-byname=$include_node -l $bin_printenv SLURMD_NODENAME]  
 expect {
 	-re "Granted job allocation ($number)" {
 		set job_id $expect_out(1,string)
@@ -297,7 +297,7 @@ set host_0      ""
 set host_1      ""
 set job_id      0
 set timeout $max_job_delay
-set salloc_pid [spawn $salloc -N$node_cnt --nodelist=$all_nodes -t1  $slaunch -n1 --task-layout-file=$hostfile -l $bin_hostname]
+set salloc_pid [spawn $salloc -N$node_cnt --nodelist=$all_nodes -t1  $slaunch -n1 --task-layout-file=$hostfile -l $bin_printenv SLURMD_NODENAME]
 expect {
 	-re "Granted job allocation ($number)" {
 		set job_id $expect_out(1,string)
diff --git a/testsuite/expect/test18.6 b/testsuite/expect/test18.6
index 08ba41a03a3410720cd076c5b06aea23c18b4c54..2534fe058c439b3def993127a4ff3fbdf05252e0 100755
--- a/testsuite/expect/test18.6
+++ b/testsuite/expect/test18.6
@@ -42,7 +42,7 @@ print_header $test_id
 # Submit a slurm job that will execute 'id' on 1 node and over task_cnt tasks
 #
 set timeout $max_job_delay
-set salloc_pid [spawn $salloc -N1 -t1 $slaunch -vv $bin_hostname]
+set salloc_pid [spawn $salloc -N1 -t1 $slaunch -vv $bin_printenv SLURMD_NODENAME]
 expect {
 	-re "Granted job allocation ($number)" {
 		set job_id $expect_out(1,string)