diff --git a/testsuite/expect/test1.15 b/testsuite/expect/test1.15
index af438e2d8f123f61c8d15d32c6e7d9e97403edc9..598b1e01e0745f47a8c35766e7e6bd8b029d4180 100755
--- a/testsuite/expect/test1.15
+++ b/testsuite/expect/test1.15
@@ -39,6 +39,10 @@ set matches     0
 
 print_header $test_id
 
+if {[test_bluegene]} {
+	send_user "\nWARNING: This test is incompatible with Bluegene systems\n"
+	exit $exit_code
+}
 if {[test_cray]} {
 	send_user "\nWARNING: This test is incompatible with Cray systems\n"
 	exit $exit_code
diff --git a/testsuite/expect/test1.2 b/testsuite/expect/test1.2
index 7dacc2523595e06930bad44b10da9cb5a6c028d4..2d3cb29c3c7405815156c54ee18f32f2aae6a7f7 100755
--- a/testsuite/expect/test1.2
+++ b/testsuite/expect/test1.2
@@ -35,12 +35,17 @@ source ./globals
 
 set test_id     "1.2"
 set exit_code   0
-set task_cnt    10
 set tasks       0
 
 print_header $test_id
 
 # if the srun --overcommit option worked this test would work.
+if {[test_bluegene]} {
+	# We never launch more than one task on emulated Bluegene
+	set task_cnt 1
+} else {
+	set task_cnt 10
+}
 if {[test_cray]} {
 	send_user "\nWARNING: This test is incompatible with Cray systems\n"
 	exit $exit_code
diff --git a/testsuite/expect/test1.21 b/testsuite/expect/test1.21
index 554cc671909e8add563b82b262d5d29303c39c34..fd3564b2ae54d418c16336a7631393f637753483 100755
--- a/testsuite/expect/test1.21
+++ b/testsuite/expect/test1.21
@@ -45,6 +45,10 @@ if {[test_cray]} {
 	send_user "\nWARNING: This test is incompatible with Cray systems\n"
 	exit $exit_code
 }
+if {[test_bluegene]} {
+	send_user "\nWARNING: This test is incompatible with Bluegene systems\n"
+	exit $exit_code
+}
 
 #
 # Spawn a shell via srun with stdout forwarding disabled
diff --git a/testsuite/expect/test1.22 b/testsuite/expect/test1.22
index 7a55f132336a6095837524917e8c29bc78cf7203..a4a7c7b010fc8eb2eecbda5583c1c7a7c450e17c 100755
--- a/testsuite/expect/test1.22
+++ b/testsuite/expect/test1.22
@@ -39,6 +39,10 @@ set exit_code   0
 
 print_header $test_id
 
+if {[test_bluegene]} {
+	send_user "\nWARNING: This test is incompatible with Bluegene systems\n"
+	exit $exit_code
+}
 if {[test_cray]} {
 	send_user "\nWARNING: This test is incompatible with Cray systems\n"
 	exit $exit_code
diff --git a/testsuite/expect/test1.33 b/testsuite/expect/test1.33
index 3f64a4382be52d8a4bc36f277f6e538d04859028..f6aedc47e8a03e846f627bb7170eee6e46c48dea 100755
--- a/testsuite/expect/test1.33
+++ b/testsuite/expect/test1.33
@@ -39,6 +39,10 @@ set test_script    "./test$test_id.bash"
 
 print_header $test_id
 
+if {[test_bluegene]} {
+	send_user "\nWARNING: This test is incompatible with Bluegene systems\n"
+	exit $exit_code
+}
 if {[test_cray]} {
 	send_user "\nWARNING: This test is incompatible with Cray systems\n"
 	exit $exit_code
diff --git a/testsuite/expect/test1.46 b/testsuite/expect/test1.46
index b94d217f8c0d53885e41ef7e1a8cb3b711df5dc3..d556c40ab03c811d8e66a248268adb28f51483b2 100755
--- a/testsuite/expect/test1.46
+++ b/testsuite/expect/test1.46
@@ -39,6 +39,10 @@ set matches     0
 
 print_header $test_id
 
+if {[test_bluegene]} {
+	send_user "\nWARNING: This test is incompatible with Bluegene systems\n"
+	exit $exit_code
+}
 if {[test_cray]} {
 	send_user "\nWARNING: This test is incompatible with Cray systems\n"
 	exit $exit_code
diff --git a/testsuite/expect/test1.9 b/testsuite/expect/test1.9
index 78031d65878b507e7e88dcb5d0108eb047820f24..639bd973812532bed493369a68f4fd32b4c443db 100755
--- a/testsuite/expect/test1.9
+++ b/testsuite/expect/test1.9
@@ -34,12 +34,17 @@ source ./globals
 
 set test_id     "1.9"
 set exit_code   0
-set task_cnt    5
 set tasks       0
 set verbosity   0
 
 print_header $test_id
 
+if {[test_bluegene]} {
+	# We never launch more than one task on emulated Bluegene
+	set task_cnt 1
+} else {
+	set task_cnt 5
+}
 if {[test_cray]} {
 	send_user "\nWARNING: This test is incompatible with Cray systems\n"
 	exit $exit_code
diff --git a/testsuite/expect/test10.12 b/testsuite/expect/test10.12
index 1283f2adbb325af24ce2b5932408381e3be762d3..e14d966a427ec4506c9f07ad215b5b3490788860 100755
--- a/testsuite/expect/test10.12
+++ b/testsuite/expect/test10.12
@@ -54,7 +54,7 @@ if {[file exists $smap] == 0} {
 #
 spawn $smap --resolve 000
 expect {
-	-re "Must be physically on a BG" {
+	-re "Must be physically on a BlueGene" {
 		set non_bg 1
 		exp_continue;
 	}
@@ -72,7 +72,7 @@ expect {
 	}
 }
 if {$non_bg != 0} {
-	send_user "\nWARNING: This test is only valid on a Blue Gene system Service Node\n"
+	send_user "\nWARNING: This test is only valid on a BlueGene system Service Node\n"
 	exit 0
 }
 if {$check != 1} {
diff --git a/testsuite/expect/test17.6 b/testsuite/expect/test17.6
index 638b8843840b8a143cc28e195c3155c5cfd97d44..2b5705bc56d9544fb1ccd9489c732987c20d9f18 100755
--- a/testsuite/expect/test17.6
+++ b/testsuite/expect/test17.6
@@ -37,11 +37,17 @@ set test_id     "17.6"
 set exit_code   0
 set file_in     "test$test_id.input"
 set file_out    "test$test_id.output"
-set task_cnt    2
 set tasks       0
 
 print_header $test_id
 
+if {[test_bluegene]} {
+	# We never launch more than one task on emulated Bluegene
+	set task_cnt    1
+} else {
+	set task_cnt    2
+}
+
 #
 # Submit a slurm job that will execute 'id' on $task_cnt tasks (or try anyway)
 #