diff --git a/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/02-CHECK-NOT-is-the-last-check-and-multiple-to-check-yet/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/02-CHECK-NOT-is-the-last-check-and-multiple-to-check-yet/sample.itest
index 1b1fc11..fb8887a 100644
--- a/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/02-CHECK-NOT-is-the-last-check-and-multiple-to-check-yet/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/02-CHECK-NOT-is-the-last-check-and-multiple-to-check-yet/sample.itest
@@ -1,4 +1,4 @@
-; RUN: %cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 1;) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
+; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 
 ; CHECK:{{^.*}}filecheck.check:1:13: error: CHECK-NOT: excluded string found in input{{$}}
 ; CHECK:; CHECK-NOT:String5
diff --git a/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/07-multiple-CHECK-NOT-do-not-get-shadowed-by-each-other/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/07-multiple-CHECK-NOT-do-not-get-shadowed-by-each-other/sample.itest
index 3cf210c..16baf2f 100644
--- a/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/07-multiple-CHECK-NOT-do-not-get-shadowed-by-each-other/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/07-multiple-CHECK-NOT-do-not-get-shadowed-by-each-other/sample.itest
@@ -1,4 +1,5 @@
-; RUN: %cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 1;) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
+; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
+
 ; CHECK:{{^.*}}filecheck.check:1:13: error: CHECK-NOT: excluded string found in input
 ; CHECK:; CHECK-NOT:warning
 ; CHECK:            ^
diff --git a/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/03-negative_match_regex/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/03-negative_match_regex/sample.itest
index 377460c..64ad1f1 100644
--- a/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/03-negative_match_regex/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/03-negative_match_regex/sample.itest
@@ -1,4 +1,4 @@
-; RUN: %cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? == 1;) | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
+; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 
 ; CHECK: {{^.*}}filecheck.check:1:14: error: CHECK-NOT: excluded string found in input{{$}}
 ; TODO: Here we could do a better match.
diff --git a/tests/integration/tests/check_commands/CHECK/one_string/negative-match/04-negative_match_no_input_lines_anymore/sample.itest b/tests/integration/tests/check_commands/CHECK/one_string/negative-match/04-negative_match_no_input_lines_anymore/sample.itest
index 354f338..5241b94 100644
--- a/tests/integration/tests/check_commands/CHECK/one_string/negative-match/04-negative_match_no_input_lines_anymore/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK/one_string/negative-match/04-negative_match_no_input_lines_anymore/sample.itest
@@ -1,4 +1,4 @@
-; RUN: %cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 1;) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
+; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 
 ; CHECK:{{^.*}}filecheck.check:2:8: error: CHECK: expected string not found in input{{$}}
 ; CHECK:CHECK: String2
diff --git a/tests/integration/tests/check_commands/CHECK/three_strings/03-negative_match_first_string/sample.itest b/tests/integration/tests/check_commands/CHECK/three_strings/03-negative_match_first_string/sample.itest
index 193391a..c9e0347 100644
--- a/tests/integration/tests/check_commands/CHECK/three_strings/03-negative_match_first_string/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK/three_strings/03-negative_match_first_string/sample.itest
@@ -1,4 +1,4 @@
-; RUN: %cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 1) | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
+; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 
 ; CHECK: {{.*filecheck.check:1:.*: error: CHECK: expected string not found in input$}}
 ; CHECK-NEXT: {{^}}; CHECK: foo{{$}}
diff --git a/tests/integration/tests/invalid_input/03_empty_check_file/sample.itest b/tests/integration/tests/invalid_input/03_empty_check_file/sample.itest
index 9953f56..f8787bc 100644
--- a/tests/integration/tests/invalid_input/03_empty_check_file/sample.itest
+++ b/tests/integration/tests/invalid_input/03_empty_check_file/sample.itest
@@ -1,4 +1,4 @@
-; RUN: printf "" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 2) | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
+; RUN: printf "" | %expect_exit 2 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 
 ; CHECK: error: no check strings found with prefix 'CHECK:'
 ; CHECK-EMPTY
diff --git a/tests/integration/tests/invalid_input/06_empty_input_file/sample.itest b/tests/integration/tests/invalid_input/06_empty_input_file/sample.itest
index 2ac3294..f1d536b 100644
--- a/tests/integration/tests/invalid_input/06_empty_input_file/sample.itest
+++ b/tests/integration/tests/invalid_input/06_empty_input_file/sample.itest
@@ -1,4 +1,4 @@
-; RUN: %cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 2) | %FILECHECK_TESTER_EXEC %s
+; RUN: %cat "%S/filecheck.input" | %expect_exit 2 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s"
 
 ; CHECK: FileCheck error: '-' is empty.
 ; CHECK: FileCheck command line:  {{.*}}.check{{$}}
diff --git a/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/02_regex/sample.itest b/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/02_regex/sample.itest
index 8287e73..3682be0 100644
--- a/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/02_regex/sample.itest
+++ b/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/02_regex/sample.itest
@@ -1 +1 @@
-; RUN: cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines --strict-whitespace
+; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines --strict-whitespace
diff --git a/tests/integration/tests/options/--strict-whitespace/CHECK/01_input_has_mixed_spaces_and_tabs/sample.itest b/tests/integration/tests/options/--strict-whitespace/CHECK/01_input_has_mixed_spaces_and_tabs/sample.itest
index f18b5f3..ac6b271 100644
--- a/tests/integration/tests/options/--strict-whitespace/CHECK/01_input_has_mixed_spaces_and_tabs/sample.itest
+++ b/tests/integration/tests/options/--strict-whitespace/CHECK/01_input_has_mixed_spaces_and_tabs/sample.itest
@@ -1,5 +1,5 @@
-; RUN: cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
-; RUN: cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace | %FILECHECK_TESTER_EXEC "%s" --match-full-lines -check-prefix=OPTION
+; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
+; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace | %FILECHECK_TESTER_EXEC "%s" --match-full-lines -check-prefix=OPTION
 
 ; OPTION: {{^.*}}filecheck.check:1:10: error: CHECK: expected string not found in input{{$}}
 ; OPTION: ; CHECK: hello world hello world
diff --git a/tests/integration/tests/options/--strict-whitespace/CHECK_NOT/02_check_has_mixed_spaces_and_tabs/sample.itest b/tests/integration/tests/options/--strict-whitespace/CHECK_NOT/02_check_has_mixed_spaces_and_tabs/sample.itest
index fc61274..6b705db 100644
--- a/tests/integration/tests/options/--strict-whitespace/CHECK_NOT/02_check_has_mixed_spaces_and_tabs/sample.itest
+++ b/tests/integration/tests/options/--strict-whitespace/CHECK_NOT/02_check_has_mixed_spaces_and_tabs/sample.itest
@@ -1,5 +1,5 @@
-; RUN: cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
-; RUN: cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines -check-prefix=OPTION
+; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
+; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines -check-prefix=OPTION
 
 ; OPTION:{{^.*}}filecheck.check:1:10: error: CHECK: expected string not found in input{{$}}
 ; OPTION:; CHECK: hello   world hello  world
diff --git a/tests/integration/tests/real_world_samples/mull/02-weird-scanning-from-here-location/sample.itest b/tests/integration/tests/real_world_samples/mull/02-weird-scanning-from-here-location/sample.itest
index 20d3063..7d81ddd 100644
--- a/tests/integration/tests/real_world_samples/mull/02-weird-scanning-from-here-location/sample.itest
+++ b/tests/integration/tests/real_world_samples/mull/02-weird-scanning-from-here-location/sample.itest
@@ -1,4 +1,5 @@
-; RUN: %cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace --match-full-lines --check-prefix=WITH-OPTION 2>&1; test $? = 1;) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
+; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace --match-full-lines --check-prefix=WITH-OPTION | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
+
 ; CHECK:{{^.*}}filecheck.check:23:15: error: WITH-OPTION: expected string not found in input
 ; CHECK-NEXT:{{^; WITH-OPTION:..\^Running mutsants \\\(threads: 2\\\): 2\\\/2\.\*\$..$}}
 ; CHECK-NEXT:{{^              \^$}}