diff --git a/testsuite/expect/test1.101 b/testsuite/expect/test1.101
index 2e5afe51e3cf00444a97e971fee503d15ff9924a..055102fdaf59a3cb55d0ce4d9fca14daa4a229fe 100755
--- a/testsuite/expect/test1.101
+++ b/testsuite/expect/test1.101
@@ -119,6 +119,11 @@ expect {
 set exec_cnt 0
 send "$srun -l --bcast=/tmp/test$test_id ./$file_in\r"
 expect {
+	-re "not supported" {
+		send_user "\nWARNING: srun --bcast option not supported on this system type (e.g. front-end)\n"
+		set exec_cnt $node_cnt
+		exp_continue
+	}
 	-re "($number): /tmp/test$test_id" {
 		incr exec_cnt
 		exp_continue
diff --git a/testsuite/expect/test1.69 b/testsuite/expect/test1.69
index 43bfae04ad5ae312521cef2b6e24c875cce832c2..f307062e825bfa143496df030bbbfacfd79056c5 100755
--- a/testsuite/expect/test1.69
+++ b/testsuite/expect/test1.69
@@ -58,6 +58,11 @@ if {![string compare $select_type "bluegene"]} {
 	send_user "\nWARNING: This test is incompatible with POE systems\n"
 	exit $exit_code
 }
+if {[test_select_type_params "Memory"]} {
+	set mem_opt "--mem=10"
+} else {
+	set mem_opt "--comment=no_mem"
+}
 
 # remove any remaining files
 exec $bin_rm -f $test_timer $test_srun $file_in
@@ -76,7 +81,7 @@ set -m
 for a in \{1..$run_timer\}
 do
   export a
-  $srun -v --mem=10 -t1 ./$test_timer &
+  $srun -v $mem_opt -t1 ./$test_timer &
 done
 "
 
diff --git a/testsuite/expect/test1.85 b/testsuite/expect/test1.85
index 61a857e71f90b953cbfdc4b64d26306f781883d8..d1e5b93698ca5564c77ae9428f6ef1c4463fa9bc 100755
--- a/testsuite/expect/test1.85
+++ b/testsuite/expect/test1.85
@@ -57,7 +57,7 @@ if {[test_serial]} {
 spawn $salloc --gres=craynetwork:0 -N 2 -n 4 -t 1
 set salloc_id $spawn_id
 expect {
-	-re "Node count specification invalid|More processors requested" {
+	-re "Node count specification invalid|More processors requested|not available" {
 		send_user "\nWARNING: can't test srun task distribution\n"
 		exit 0
 	}
diff --git a/testsuite/expect/test5.10 b/testsuite/expect/test5.10
index ab6cb9b2897f5cfb813282cc4b753066c78f6289..ca6a33905d56f1ceedefb80630eff3239b4a1aa5 100755
--- a/testsuite/expect/test5.10
+++ b/testsuite/expect/test5.10
@@ -178,6 +178,7 @@ if {[string length $def_part] == 0} {
 }
 
 # Get a list of nodes
+set timeout $max_job_delay
 spawn $bin_bash -c "exec $srun -N[available_nodes $def_part idle] $bin_printenv | $bin_grep NODE"
 expect {
 	-re "SLURM_NODELIST=($alpha_numeric_nodelist)" {
diff --git a/testsuite/expect/test5.9 b/testsuite/expect/test5.9
index 29570234fa793ace553fe0477b38df06d7152a88..e8c963380b09af5ef1f8330b7e3fefa783d7cbb6 100755
--- a/testsuite/expect/test5.9
+++ b/testsuite/expect/test5.9
@@ -162,12 +162,17 @@ if {$got_node != 1} {
 	exit 0
 }
 
+set socket_cnt 1
 spawn $scontrol show node $test_node
 expect {
 	-re "CoresPerSocket=($number)" {
 		set sq_format(ntpersocket) $expect_out(1,string)
 		exp_continue
 	}
+	-re "Sockets=($number)" {
+		set socket_cnt $expect_out(1,string)
+		exp_continue
+	}
 	-re "ThreadsPerCore=($number)" {
 		set sq_format(cpuspertask) $expect_out(1,string)
 		exp_continue
@@ -181,6 +186,11 @@ expect {
 	}
 }
 
+set core_cnt [expr $socket_cnt * $sq_format(ntpersocket)]
+if {$sq_format(ntpernode) > $core_cnt} {
+	set sq_format(ntpernode) $core_cnt
+}
+
 if {$sq_format(ntpersocket) == 0 || $sq_format(cpuspertask) == 0} {
 	send_user "\nFAILURE: failed to get number of threads or cores "
 	send_user "ThreadsPerCore=$sq_format(cpuspertask) & "
diff --git a/testsuite/expect/test7.15 b/testsuite/expect/test7.15
index 28ab074fc84251296cce50a37f3ed9aaed5ad79d..28354f223e36c3456611b6fb3676290316a16f6b 100755
--- a/testsuite/expect/test7.15
+++ b/testsuite/expect/test7.15
@@ -83,7 +83,7 @@ expect {
 		}
 	}
 	timeout {
-		send_user "\nFAILURE: srun not responding"
+		send_user "\nFAILURE: srun not responding\n"
 		slow_kill $srun_pid
 		set exit_code 1
 	}