diff --git a/testsuite/expect/test1.87 b/testsuite/expect/test1.87
index c9fd09312be69a17a1eb0ef7f77ed72b4cbbf7a6..be5f10717f5c11e181f79259268e2eb827e66143 100755
--- a/testsuite/expect/test1.87
+++ b/testsuite/expect/test1.87
@@ -45,11 +45,6 @@ if {[test_front_end] != 0} {
 	exit 0
 }
 
-if {[test_multiple_slurmd] != 0} {
-	send_user "\nWARNING: This test is incompatable with multiple slurmd systems\n"
-	exit 0
-}
-
 #
 # Build input script file
 #
@@ -100,7 +95,7 @@ set host_0      ""
 set host_1      ""
 set host_2      ""
 set host_3      ""
-send "$srun -l $bin_hostname\n"
+send "$srun -l $bin_printenv SLURMD_NODENAME\n"
 expect {
 	-re "($number): ($alpha_numeric)" {
 		set host_num $expect_out(1,string)
@@ -164,7 +159,7 @@ if {$exit_code != 0} {
 #
 set matches 0
 
-send "$srun -l -N2 -n2 --relative=0 $bin_hostname\n"
+send "$srun -l -N2 -n2 --relative=0 $bin_printenv SLURMD_NODENAME\n"
 expect {
 	-re "($number): ($alpha_numeric)" {
 		set host_num $expect_out(1,string)
@@ -215,7 +210,7 @@ if {$matches < 2} {
 # Get two nodes relative (starting at) node 2
 #
 set matches 0
-send "$srun -l -N2 -n2 --relative=2 $bin_hostname\n"
+send "$srun -l -N2 -n2 --relative=2 $bin_printenv SLURMD_NODENAME\n"
 expect {
 	-re "($number): ($alpha_numeric)" {
 		set host_num $expect_out(1,string)
@@ -267,7 +262,7 @@ if {$matches < 2} {
 # Since there is only one node left, we check for a error message
 #
 set error 0
-send "$srun -l -N2 -n2 -O --relative=3 $bin_hostname\n"
+send "$srun -l -N2 -n2 -O --relative=3 $bin_printenv SLURMD_NODENAME\n"
 expect {
 	-re "error:" {
 		send_user "This error is expected, no worries\n"