diff --git a/testsuite/expect/test1.88 b/testsuite/expect/test1.88
index 0419555e140a55956f6344250bccae6a044c1bff..90da1a4337f68197987cbcb1f5988fe657e58454 100755
--- a/testsuite/expect/test1.88
+++ b/testsuite/expect/test1.88
@@ -54,13 +54,15 @@ if {[file executable $mpicc] == 0} {
 	send_user "\nWARNING: $mpicc does not exists\n"
 	exit 0
 }
-if {[test_front_end] != 0} {
+if {[test_front_end]} {
         send_user "\nWARNING: This test is incompatible with front-end systems\n"
         exit 0
-}
-if {[test_aix] == 1} {
+} elseif {[test_aix]} {
 	send_user "WARNING: Test is incompatible with AIX\n"
 	exit 0
+} elseif {[test_serial]} {
+	send_user "WARNING: Test is incompatible with serial system\n"
+	exit 0
 }
 
 #
diff --git a/testsuite/expect/test1.95 b/testsuite/expect/test1.95
index 2ff01966437ec1fadfea58516a8ab6268324eb0e..93aab08cfa37e5d39247f8163c3cb3bd5f76ba99 100755
--- a/testsuite/expect/test1.95
+++ b/testsuite/expect/test1.95
@@ -53,13 +53,15 @@ if {[file executable $upcc] == 0} {
 	send_user "\nWARNING: $upcc does not exists\n"
 	exit 0
 }
-if {[test_front_end] != 0} {
+if {[test_front_end]} {
 	send_user "\nWARNING: This test is incompatible with front-end systems\n"
 	exit 0
-}
-if {[test_aix] == 1} {
+} elseif {[test_aix]} {
 	send_user "WARNING: Test is incompatible with AIX\n"
 	exit 0
+} elseif {[test_serial]} {
+	send_user "WARNING: Test is incompatible with serial system\n"
+	exit 0
 }
 
 #
@@ -68,7 +70,6 @@ if {[test_aix] == 1} {
 exec $bin_rm -f $test_prog ${test_prog}.o
 exec $upcc -o $test_prog ${test_prog}.upc
 
-
 # Delete left-over stdout/err files
 file delete $file_out $file_err