diff --git a/tests/integration/tests/check_commands/CHECK-EMPTY/04-error_valid_but_followed_by_another_2_check_empty/sample.itest b/tests/integration/tests/check_commands/CHECK-EMPTY/04-error_valid_but_followed_by_another_2_check_empty/sample.itest
index 6de377c..c2c681b 100644
--- a/tests/integration/tests/check_commands/CHECK-EMPTY/04-error_valid_but_followed_by_another_2_check_empty/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK-EMPTY/04-error_valid_but_followed_by_another_2_check_empty/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" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 1) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK:{{.*}}filecheck.check:3:15: error: CHECK-EMPTY: expected string not found in input{{$}}
 ; CHECK:; CHECK-EMPTY:
diff --git a/tests/integration/tests/check_commands/CHECK-EMPTY/05-success_CHECK_EMPTY_after_CHECK/sample.itest b/tests/integration/tests/check_commands/CHECK-EMPTY/05-success_CHECK_EMPTY_after_CHECK/sample.itest
index 77b5a80..194263b 100644
--- a/tests/integration/tests/check_commands/CHECK-EMPTY/05-success_CHECK_EMPTY_after_CHECK/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK-EMPTY/05-success_CHECK_EMPTY_after_CHECK/sample.itest
@@ -1,3 +1,3 @@
-; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 0) | %FILECHECK_TESTER_EXEC %s --match-full-lines
+; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 0) | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-EMPTY:
diff --git a/tests/integration/tests/check_commands/CHECK-EMPTY/06-success_CHECK_EMPTY_after_CHECK_two_times/sample.itest b/tests/integration/tests/check_commands/CHECK-EMPTY/06-success_CHECK_EMPTY_after_CHECK_two_times/sample.itest
index 77b5a80..194263b 100644
--- a/tests/integration/tests/check_commands/CHECK-EMPTY/06-success_CHECK_EMPTY_after_CHECK_two_times/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK-EMPTY/06-success_CHECK_EMPTY_after_CHECK_two_times/sample.itest
@@ -1,3 +1,3 @@
-; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 0) | %FILECHECK_TESTER_EXEC %s --match-full-lines
+; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 0) | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-EMPTY:
diff --git a/tests/integration/tests/check_commands/CHECK-NEXT/01-negative_match_line_does_not_exist/sample.itest b/tests/integration/tests/check_commands/CHECK-NEXT/01-negative_match_line_does_not_exist/sample.itest
index f2de394..ba3942e 100644
--- a/tests/integration/tests/check_commands/CHECK-NEXT/01-negative_match_line_does_not_exist/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK-NEXT/01-negative_match_line_does_not_exist/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" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 1;) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK:{{.*}}filecheck.check:2:15: error: CHECK-NEXT: expected string not found in input
 ; CHECK:; CHECK-NEXT: foo
diff --git a/tests/integration/tests/check_commands/CHECK-NEXT/02-negative_match_line_exist_but_later/sample.itest b/tests/integration/tests/check_commands/CHECK-NEXT/02-negative_match_line_exist_but_later/sample.itest
index fc032d3..9b00b13 100644
--- a/tests/integration/tests/check_commands/CHECK-NEXT/02-negative_match_line_exist_but_later/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK-NEXT/02-negative_match_line_exist_but_later/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" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 1;) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-NEXT:{{.*}}filecheck.check:2:15: error: CHECK-NEXT: is not on the line after the previous match{{$}}
 ; CHECK-NEXT:; CHECK-NEXT: string 3
diff --git a/tests/integration/tests/check_commands/CHECK-NEXT/03-negative-match-check-next-on-the-first-line-no-match-exist/sample.itest b/tests/integration/tests/check_commands/CHECK-NEXT/03-negative-match-check-next-on-the-first-line-no-match-exist/sample.itest
index 982ec31..9e1aa29 100644
--- a/tests/integration/tests/check_commands/CHECK-NEXT/03-negative-match-check-next-on-the-first-line-no-match-exist/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK-NEXT/03-negative-match-check-next-on-the-first-line-no-match-exist/sample.itest
@@ -1,4 +1,4 @@
-; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 2;) | %FILECHECK_TESTER_EXEC %s --strict-whitespace --match-full-lines
+; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 2;) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK:{{^.*}}filecheck.check:1:4: error: found 'CHECK-NEXT' without previous 'CHECK: line{{$}}
 ; CHECK:// CHECK-NEXT: 2
diff --git a/tests/integration/tests/check_commands/CHECK-NEXT/04-negative_regex_match/sample.itest b/tests/integration/tests/check_commands/CHECK-NEXT/04-negative_regex_match/sample.itest
index e27d0b3..3eabf2c 100644
--- a/tests/integration/tests/check_commands/CHECK-NEXT/04-negative_regex_match/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK-NEXT/04-negative_regex_match/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" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 1;) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-NEXT:{{.*}}filecheck.check:2:15: error: CHECK-NEXT: is not on the line after the previous match{{$}}
 ; CHECK-NEXT:{{^; CHECK-NEXT: ..string 3..$}}
diff --git a/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/01-failing-CHECK-NOT-followed-by-valid-CHECK/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/01-failing-CHECK-NOT-followed-by-valid-CHECK/sample.itest
index 0532b7b..75add8c 100644
--- a/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/01-failing-CHECK-NOT-followed-by-valid-CHECK/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/01-failing-CHECK-NOT-followed-by-valid-CHECK/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" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 1;) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK:{{^.*}}:1:13: error: CHECK-NOT: excluded string found in input
 ; CHECK:{{; CHECK-NOT:..\.\*String1.*..}}
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 340b39b..e6d0ba8 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" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 1;) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; 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/03-CHECK-NOT-has-no-effect-if-next-CHECK-passed/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/03-CHECK-NOT-has-no-effect-if-next-CHECK-passed/sample.itest
index fff593d..a51952d 100644
--- a/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/03-CHECK-NOT-has-no-effect-if-next-CHECK-passed/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/03-CHECK-NOT-has-no-effect-if-next-CHECK-passed/sample.itest
@@ -1,3 +1,3 @@
-; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 0;) | %FILECHECK_TESTER_EXEC %s --strict-whitespace --match-full-lines
+; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 0;) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-EMPTY:
diff --git a/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/04-when-no-input-anymore-filters-out-CHECK-NOT-but-fails-on-CHECK/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/04-when-no-input-anymore-filters-out-CHECK-NOT-but-fails-on-CHECK/sample.itest
index 1b4bc9a..ac198de 100644
--- a/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/04-when-no-input-anymore-filters-out-CHECK-NOT-but-fails-on-CHECK/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/04-when-no-input-anymore-filters-out-CHECK-NOT-but-fails-on-CHECK/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" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 1;) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK:{{^.*}}filecheck.check:3:9: error: CHECK: expected string not found in input{{$}}
 ; CHECK:; CHECK:String3
diff --git a/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/06-multiple-CHECK-NOT-all-have-effect/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/06-multiple-CHECK-NOT-all-have-effect/sample.itest
index 3cdb428..c37234d 100644
--- a/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/06-multiple-CHECK-NOT-all-have-effect/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/06-multiple-CHECK-NOT-all-have-effect/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" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 1;) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK:; CHECK-NOT:warning
 ; CHECK:            ^
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 7662ddf..53d40e1 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,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" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 1;) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK:{{^.*}}filecheck.check:1:13: error: CHECK-NOT: excluded string found in input
 ; CHECK:; CHECK-NOT:warning
diff --git a/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/CHECK-has-a-higher-priority-than-CHECK-NOT/01-minimal-example/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/CHECK-has-a-higher-priority-than-CHECK-NOT/01-minimal-example/sample.itest
index 9dcc0e8..e13a9c9 100644
--- a/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/CHECK-has-a-higher-priority-than-CHECK-NOT/01-minimal-example/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/CHECK-has-a-higher-priority-than-CHECK-NOT/01-minimal-example/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" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 1;) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK:{{^.*}}filecheck.check:2:9: error: CHECK: expected string not found in input
 ; CHECK:; CHECK:String2
diff --git a/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/CHECK-has-a-higher-priority-than-CHECK-NOT/02-example-with-placeholder-string/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/CHECK-has-a-higher-priority-than-CHECK-NOT/02-example-with-placeholder-string/sample.itest
index fac1623..cbd4ca5 100644
--- a/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/CHECK-has-a-higher-priority-than-CHECK-NOT/02-example-with-placeholder-string/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/CHECK-has-a-higher-priority-than-CHECK-NOT/02-example-with-placeholder-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 --strict-whitespace --match-full-lines
+; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 1;) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK:{{^.*}}:2:9: error: CHECK: expected string not found in input
 ; CHECK:; CHECK:String3
diff --git a/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/01-negative_match/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/01-negative_match/sample.itest
index 4e3bb32..4f5e094 100644
--- a/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/01-negative_match/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/01-negative_match/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" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? == 1;) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-NEXT:{{^.*}}filecheck.check:1:14: error: CHECK-NOT: excluded string found in input{{$}}
 ; CHECK-NEXT:; CHECK-NOT: hello
diff --git a/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/02-negative_match_whitespaces/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/02-negative_match_whitespaces/sample.itest
index d584e9d..59f7451 100644
--- a/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/02-negative_match_whitespaces/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/02-negative_match_whitespaces/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" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? == 1;) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-NEXT:{{^.*}}filecheck.check:1:14: error: CHECK-NOT: excluded string found in input{{$}}
 ; CHECK-NEXT:{{^; CHECK-NOT: hello world$}}
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 94f99c4..7b1ba76 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" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? == 1;) | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-NEXT: {{^.*}}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-NOT/one_string/negative/04-negative-match-regex-escaping_non_regex_parts/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/04-negative-match-regex-escaping_non_regex_parts/sample.itest
index 87e5766..7108cf8 100644
--- a/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/04-negative-match-regex-escaping_non_regex_parts/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/04-negative-match-regex-escaping_non_regex_parts/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" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 1;) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-NEXT:{{^.*}}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-NOT/one_string/positive/01-positive_match/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/01-positive_match/sample.itest
index 588f28c..962aebb 100644
--- a/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/01-positive_match/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/01-positive_match/sample.itest
@@ -1,3 +1,3 @@
-; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? == 0;) | %FILECHECK_TESTER_EXEC %s --match-full-lines
+; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? == 0;) | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-EMPTY:
diff --git a/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/02-positive_check_effective_only_one_line_before_next_check/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/02-positive_check_effective_only_one_line_before_next_check/sample.itest
index 588f28c..962aebb 100644
--- a/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/02-positive_check_effective_only_one_line_before_next_check/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/02-positive_check_effective_only_one_line_before_next_check/sample.itest
@@ -1,3 +1,3 @@
-; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? == 0;) | %FILECHECK_TESTER_EXEC %s --match-full-lines
+; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? == 0;) | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-EMPTY:
diff --git a/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/03-positive_match_regex/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/03-positive_match_regex/sample.itest
index 588f28c..962aebb 100644
--- a/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/03-positive_match_regex/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/03-positive_match_regex/sample.itest
@@ -1,3 +1,3 @@
-; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? == 0;) | %FILECHECK_TESTER_EXEC %s --match-full-lines
+; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? == 0;) | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-EMPTY:
diff --git a/tests/integration/tests/check_commands/CHECK/many_strings/01-negative-match-of-string-between-many-placeholder-strings/sample.itest b/tests/integration/tests/check_commands/CHECK/many_strings/01-negative-match-of-string-between-many-placeholder-strings/sample.itest
index b90a88f..cec91b9 100644
--- a/tests/integration/tests/check_commands/CHECK/many_strings/01-negative-match-of-string-between-many-placeholder-strings/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK/many_strings/01-negative-match-of-string-between-many-placeholder-strings/sample.itest
@@ -1,4 +1,4 @@
-; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace --match-full-lines 2>&1; test $? = 1;) | %FILECHECK_TESTER_EXEC %s --strict-whitespace --match-full-lines
+; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace --match-full-lines 2>&1; test $? = 1;) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-NEXT:{{^.*}}filecheck.check:1:9: error: CHECK: expected string not found in input
 ; CHECK-NEXT:{{^; CHECK:..STRINGGG..$}}
diff --git a/tests/integration/tests/check_commands/CHECK/one_string/negative-match/01-negative_match/sample.itest b/tests/integration/tests/check_commands/CHECK/one_string/negative-match/01-negative_match/sample.itest
index 4459a00..4b127f7 100644
--- a/tests/integration/tests/check_commands/CHECK/one_string/negative-match/01-negative_match/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK/one_string/negative-match/01-negative_match/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" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 1;) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK:{{.*}}filecheck.check:1:10: error: CHECK: expected string not found in input{{$}}
 ; CHECK:{{^}}; CHECK: foo{{$}}
diff --git a/tests/integration/tests/check_commands/CHECK/one_string/negative-match/02-negative_regex_match/sample.itest b/tests/integration/tests/check_commands/CHECK/one_string/negative-match/02-negative_regex_match/sample.itest
index 98bb2e2..384f40f 100644
--- a/tests/integration/tests/check_commands/CHECK/one_string/negative-match/02-negative_regex_match/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK/one_string/negative-match/02-negative_regex_match/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" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 1) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-NEXT:{{.*}}filecheck.check:1:10: error: CHECK: expected string not found in input{{$}}
 ; CHECK-NEXT:{{^; CHECK: .....hello.....$}}
diff --git a/tests/integration/tests/check_commands/CHECK/one_string/negative-match/03-negative_regex_match_spaces_before_string/sample.itest b/tests/integration/tests/check_commands/CHECK/one_string/negative-match/03-negative_regex_match_spaces_before_string/sample.itest
index 22097b0..9f2bc3b 100644
--- a/tests/integration/tests/check_commands/CHECK/one_string/negative-match/03-negative_regex_match_spaces_before_string/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK/one_string/negative-match/03-negative_regex_match_spaces_before_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 --strict-whitespace --match-full-lines
+; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 1) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-NEXT:{{.*}}filecheck.check:1:10: error: CHECK: expected string not found in input{{$}}
 ; CHECK-NEXT:{{^; CHECK: .....hello.....$}}
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 597fe94..778ad33 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" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 1;) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; 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/one_string/positive-match/02-positive_match_check_without_preceeding_semicolon/sample.itest b/tests/integration/tests/check_commands/CHECK/one_string/positive-match/02-positive_match_check_without_preceeding_semicolon/sample.itest
index 3c47c68..87a1fb1 100644
--- a/tests/integration/tests/check_commands/CHECK/one_string/positive-match/02-positive_match_check_without_preceeding_semicolon/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK/one_string/positive-match/02-positive_match_check_without_preceeding_semicolon/sample.itest
@@ -1,2 +1,2 @@
-; RUN: printf "hello" | %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC %s --match-full-lines
+; RUN: printf "hello" | %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
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 b3fd4c0..1325dca 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" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 1) | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-NEXT: {{.*filecheck.check:1:.*: error: CHECK: expected string not found in input$}}
 ; CHECK-NEXT: {{^}}; CHECK: foo{{$}}
diff --git a/tests/integration/tests/check_commands/CHECK/three_strings/04-negative_match_first_string_scanning_for_the_best_match/sample.itest b/tests/integration/tests/check_commands/CHECK/three_strings/04-negative_match_first_string_scanning_for_the_best_match/sample.itest
index 3a5da7a..e9f82d3 100644
--- a/tests/integration/tests/check_commands/CHECK/three_strings/04-negative_match_first_string_scanning_for_the_best_match/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK/three_strings/04-negative_match_first_string_scanning_for_the_best_match/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" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 1) | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-NEXT: {{.*filecheck.check:1:.*: error: CHECK: expected string not found in input$}}
 ; CHECK-NEXT: {{^}}; CHECK: foo{{$}}
diff --git a/tests/integration/tests/check_commands/CHECK/three_strings/05-negative_match_first_string_no_best_match/sample.itest b/tests/integration/tests/check_commands/CHECK/three_strings/05-negative_match_first_string_no_best_match/sample.itest
index 4d99204..078f585 100644
--- a/tests/integration/tests/check_commands/CHECK/three_strings/05-negative_match_first_string_no_best_match/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK/three_strings/05-negative_match_first_string_no_best_match/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" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 1) | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-NEXT: {{.*filecheck.check:1:.*: error: CHECK: expected string not found in input$}}
 ; CHECK-NEXT: {{^}}; CHECK: foo{{$}}
diff --git a/tests/integration/tests/check_commands/CHECK/three_strings/06-negative_match_second_string/sample.itest b/tests/integration/tests/check_commands/CHECK/three_strings/06-negative_match_second_string/sample.itest
index 1e837e7..c278229 100644
--- a/tests/integration/tests/check_commands/CHECK/three_strings/06-negative_match_second_string/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK/three_strings/06-negative_match_second_string/sample.itest
@@ -1,4 +1,4 @@
-; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1 || true) | %FILECHECK_TESTER_EXEC %s --match-full-lines
+; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1 || true) | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK: {{.*filecheck.check:2:10: error: CHECK: expected string not found in input$}}
 ; CHECK: {{^}}; CHECK: foo{{$}}
diff --git a/tests/integration/tests/check_commands/CHECK/three_strings/07-negative_match_third_string/sample.itest b/tests/integration/tests/check_commands/CHECK/three_strings/07-negative_match_third_string/sample.itest
index 9419a9a..3ba2a27 100644
--- a/tests/integration/tests/check_commands/CHECK/three_strings/07-negative_match_third_string/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK/three_strings/07-negative_match_third_string/sample.itest
@@ -1,4 +1,4 @@
-; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1 || true) | %FILECHECK_TESTER_EXEC %s --match-full-lines
+; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1 || true) | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK: {{.*filecheck.check:3:10: error: CHECK: expected string not found in input$}}
 ; CHECK: {{^}}; CHECK: foo{{$}}
diff --git a/tests/integration/tests/check_commands/CHECK/two_strings/01-positive_match/sample.itest b/tests/integration/tests/check_commands/CHECK/two_strings/01-positive_match/sample.itest
index d9fb89e..df24cf4 100644
--- a/tests/integration/tests/check_commands/CHECK/two_strings/01-positive_match/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK/two_strings/01-positive_match/sample.itest
@@ -1,3 +1,3 @@
-; RUN: cat "%S/filecheck.input" | %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC %s --match-full-lines
+; RUN: cat "%S/filecheck.input" | %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-EMPTY:
diff --git a/tests/integration/tests/check_commands/CHECK/two_strings/02-positive_match-one-line-between/sample.itest b/tests/integration/tests/check_commands/CHECK/two_strings/02-positive_match-one-line-between/sample.itest
index d9fb89e..df24cf4 100644
--- a/tests/integration/tests/check_commands/CHECK/two_strings/02-positive_match-one-line-between/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK/two_strings/02-positive_match-one-line-between/sample.itest
@@ -1,3 +1,3 @@
-; RUN: cat "%S/filecheck.input" | %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC %s --match-full-lines
+; RUN: cat "%S/filecheck.input" | %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-EMPTY:
diff --git a/tests/integration/tests/check_commands/CHECK/two_strings/03-negative_match_first_string/sample.itest b/tests/integration/tests/check_commands/CHECK/two_strings/03-negative_match_first_string/sample.itest
index b3fd4c0..1325dca 100644
--- a/tests/integration/tests/check_commands/CHECK/two_strings/03-negative_match_first_string/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK/two_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" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 1) | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-NEXT: {{.*filecheck.check:1:.*: error: CHECK: expected string not found in input$}}
 ; CHECK-NEXT: {{^}}; CHECK: foo{{$}}
diff --git a/tests/integration/tests/check_commands/CHECK/two_strings/04-negative_match_second_string/sample.itest b/tests/integration/tests/check_commands/CHECK/two_strings/04-negative_match_second_string/sample.itest
index 1e837e7..c278229 100644
--- a/tests/integration/tests/check_commands/CHECK/two_strings/04-negative_match_second_string/sample.itest
+++ b/tests/integration/tests/check_commands/CHECK/two_strings/04-negative_match_second_string/sample.itest
@@ -1,4 +1,4 @@
-; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1 || true) | %FILECHECK_TESTER_EXEC %s --match-full-lines
+; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1 || true) | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK: {{.*filecheck.check:2:10: error: CHECK: expected string not found in input$}}
 ; CHECK: {{^}}; CHECK: foo{{$}}
diff --git a/tests/integration/tests/invalid_input/01_empty_invocation/sample.itest b/tests/integration/tests/invalid_input/01_empty_invocation/sample.itest
index f21fe02..0c7b65c 100644
--- a/tests/integration/tests/invalid_input/01_empty_invocation/sample.itest
+++ b/tests/integration/tests/invalid_input/01_empty_invocation/sample.itest
@@ -1,3 +1,3 @@
-; RUN: (%FILECHECK_EXEC 2>&1; test $? = 2) | %FILECHECK_TESTER_EXEC %s --match-full-lines
+; RUN: (%FILECHECK_EXEC 2>&1; test $? = 2) | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-NEXT: <check-file> not specified
diff --git a/tests/integration/tests/invalid_input/02_check_file_does_not_exist/sample.itest b/tests/integration/tests/invalid_input/02_check_file_does_not_exist/sample.itest
index 0fd93a1..1afca73 100644
--- a/tests/integration/tests/invalid_input/02_check_file_does_not_exist/sample.itest
+++ b/tests/integration/tests/invalid_input/02_check_file_does_not_exist/sample.itest
@@ -1,4 +1,4 @@
-; RUN: (%FILECHECK_EXEC file/does/not/exist 2>&1; test $? = 2) | %FILECHECK_TESTER_EXEC %s --match-full-lines
+; RUN: (%FILECHECK_EXEC file/does/not/exist 2>&1; test $? = 2) | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK: Could not open check file 'file/does/not/exist': No such file or directory
 ; CHECK-EMPTY:
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 b3b92a0..d5af1cb 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 "" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 2) | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK: error: no check strings found with prefix 'CHECK:'
 ; CHECK-EMPTY
diff --git a/tests/integration/tests/invalid_input/04_nonempty_check_file_but_no_checks/sample.itest b/tests/integration/tests/invalid_input/04_nonempty_check_file_but_no_checks/sample.itest
index b3b92a0..d5af1cb 100644
--- a/tests/integration/tests/invalid_input/04_nonempty_check_file_but_no_checks/sample.itest
+++ b/tests/integration/tests/invalid_input/04_nonempty_check_file_but_no_checks/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 "" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 2) | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK: error: no check strings found with prefix 'CHECK:'
 ; CHECK-EMPTY
diff --git a/tests/integration/tests/invalid_input/05_one_newline_symbol_input/sample.itest b/tests/integration/tests/invalid_input/05_one_newline_symbol_input/sample.itest
index 5ce960a..f9fa870 100644
--- a/tests/integration/tests/invalid_input/05_one_newline_symbol_input/sample.itest
+++ b/tests/integration/tests/invalid_input/05_one_newline_symbol_input/sample.itest
@@ -1,3 +1,3 @@
-; RUN: printf "\n" | %FILECHECK_EXEC "%S/filecheck.check" 2>&1 | %FILECHECK_TESTER_EXEC %s
+; RUN: printf "\n" | %FILECHECK_EXEC "%S/filecheck.check" 2>&1 | %FILECHECK_TESTER_EXEC "%s"
 ; CHECK: {{.*}}FileCheck
 ; 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 071ce8f..fe58691 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,3 +1,3 @@
-; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 2) | %FILECHECK_TESTER_EXEC %s
+; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 2) | %FILECHECK_TESTER_EXEC "%s"
 ; CHECK: FileCheck error: '-' is empty.
 ; CHECK: FileCheck command line:  {{.*}}.check{{$}}
diff --git a/tests/integration/tests/options/--check-prefix/01_positive/sample.itest b/tests/integration/tests/options/--check-prefix/01_positive/sample.itest
index a6dea2c..68910b2 100644
--- a/tests/integration/tests/options/--check-prefix/01_positive/sample.itest
+++ b/tests/integration/tests/options/--check-prefix/01_positive/sample.itest
@@ -1,6 +1,6 @@
-; RUN: cat "%S/filecheck.input" | %FILECHECK_EXEC "%S/filecheck.check" --check-prefix STRING1 | %FILECHECK_TESTER_EXEC %s --strict-whitespace --match-full-lines
-; RUN: cat "%S/filecheck.input" | %FILECHECK_EXEC "%S/filecheck.check" --check-prefix STRING2 | %FILECHECK_TESTER_EXEC %s --strict-whitespace --match-full-lines
-; RUN: cat "%S/filecheck.input" | %FILECHECK_EXEC "%S/filecheck.check" --check-prefix STRING3 | %FILECHECK_TESTER_EXEC %s --strict-whitespace --match-full-lines
+; RUN: cat "%S/filecheck.input" | %FILECHECK_EXEC "%S/filecheck.check" --check-prefix STRING1 | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
+; RUN: cat "%S/filecheck.input" | %FILECHECK_EXEC "%S/filecheck.check" --check-prefix STRING2 | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
+; RUN: cat "%S/filecheck.input" | %FILECHECK_EXEC "%S/filecheck.check" --check-prefix STRING3 | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-EMPTY:
diff --git a/tests/integration/tests/options/--check-prefix/02_negative/sample.itest b/tests/integration/tests/options/--check-prefix/02_negative/sample.itest
index fe93609..552c644 100644
--- a/tests/integration/tests/options/--check-prefix/02_negative/sample.itest
+++ b/tests/integration/tests/options/--check-prefix/02_negative/sample.itest
@@ -1,4 +1,4 @@
-; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" --check-prefix FOO 2>&1; test $? = 2) | %FILECHECK_TESTER_EXEC %s --strict-whitespace --match-full-lines
+; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" --check-prefix FOO 2>&1; test $? = 2) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK:error: no check strings found with prefix 'FOO:'
diff --git a/tests/integration/tests/options/--check-prefix/03_malformed_prefix/sample.itest b/tests/integration/tests/options/--check-prefix/03_malformed_prefix/sample.itest
index 611b298..0e854c7 100644
--- a/tests/integration/tests/options/--check-prefix/03_malformed_prefix/sample.itest
+++ b/tests/integration/tests/options/--check-prefix/03_malformed_prefix/sample.itest
@@ -1,4 +1,4 @@
-; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" --check-prefix "GARBAGE1.23.4.2" 2>&1; test $? = 2) | %FILECHECK_TESTER_EXEC %s --strict-whitespace --match-full-lines
+; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" --check-prefix "GARBAGE1.23.4.2" 2>&1; test $? = 2) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK:Supplied check-prefix is invalid! Prefixes must be unique and start with a letter and contain only alphanumeric characters, hyphens and underscores
diff --git a/tests/integration/tests/options/--help/sample.itest b/tests/integration/tests/options/--help/sample.itest
index 50eb518..60b569a 100644
--- a/tests/integration/tests/options/--help/sample.itest
+++ b/tests/integration/tests/options/--help/sample.itest
@@ -1,4 +1,4 @@
-; RUN: (%FILECHECK_EXEC --help 2>&1; test $? = 0) | %FILECHECK_TESTER_EXEC %s --strict-whitespace --match-full-lines
+; RUN: (%FILECHECK_EXEC --help 2>&1; test $? = 0) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-NEXT:{{^USAGE: [Ff]ile[Cc]heck.* \[options\] <check-file>$}}
 ; CHECK-EMPTY:
diff --git a/tests/integration/tests/options/--match-full-lines/CHECK-NOT/01_option_has_no_effect/sample.itest b/tests/integration/tests/options/--match-full-lines/CHECK-NOT/01_option_has_no_effect/sample.itest
index 8787b63..ec3ae0c 100644
--- a/tests/integration/tests/options/--match-full-lines/CHECK-NOT/01_option_has_no_effect/sample.itest
+++ b/tests/integration/tests/options/--match-full-lines/CHECK-NOT/01_option_has_no_effect/sample.itest
@@ -1,5 +1,5 @@
-; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 1) | %FILECHECK_TESTER_EXEC %s --match-full-lines --strict-whitespace
-; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" --match-full-lines 2>&1; test $? = 1) | %FILECHECK_TESTER_EXEC %s --match-full-lines --strict-whitespace
+; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 1) | %FILECHECK_TESTER_EXEC "%s" --match-full-lines --strict-whitespace
+; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" --match-full-lines 2>&1; test $? = 1) | %FILECHECK_TESTER_EXEC "%s" --match-full-lines --strict-whitespace
 
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK:{{^.*}}filecheck.check:1:14: error: CHECK-NOT: excluded string found in input{{$}}
diff --git a/tests/integration/tests/options/--match-full-lines/CHECK/01_matching_substring_is_rejected_when_full_match_enabled/sample.itest b/tests/integration/tests/options/--match-full-lines/CHECK/01_matching_substring_is_rejected_when_full_match_enabled/sample.itest
index d18d8aa..75ac290 100644
--- a/tests/integration/tests/options/--match-full-lines/CHECK/01_matching_substring_is_rejected_when_full_match_enabled/sample.itest
+++ b/tests/integration/tests/options/--match-full-lines/CHECK/01_matching_substring_is_rejected_when_full_match_enabled/sample.itest
@@ -1,5 +1,5 @@
-; RUN: cat "%S/filecheck.input" | %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC %s --match-full-lines -check-prefix=NO_OPTION
-; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" --match-full-lines 2>&1; test $? = 1) | %FILECHECK_TESTER_EXEC %s --match-full-lines --strict-whitespace -check-prefix=OPTION
+; RUN: cat "%S/filecheck.input" | %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines -check-prefix=NO_OPTION
+; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" --match-full-lines 2>&1; test $? = 1) | %FILECHECK_TESTER_EXEC "%s" --match-full-lines --strict-whitespace -check-prefix=OPTION
 
 ; NO_OPTION: {{^.*}}FileCheck{{(\.py)?$}}
 ; NO_OPTION-EMPTY:
diff --git a/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/01_when_no_strict_whitespace_then_leading_whitespace_is_ignored/sample.itest b/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/01_when_no_strict_whitespace_then_leading_whitespace_is_ignored/sample.itest
index eb89802..a4fd371 100644
--- a/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/01_when_no_strict_whitespace_then_leading_whitespace_is_ignored/sample.itest
+++ b/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/01_when_no_strict_whitespace_then_leading_whitespace_is_ignored/sample.itest
@@ -1,4 +1,4 @@
-; RUN: cat "%S/filecheck.input" | %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines | %FILECHECK_TESTER_EXEC %s --match-full-lines --strict-whitespace
+; RUN: cat "%S/filecheck.input" | %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines | %FILECHECK_TESTER_EXEC "%s" --match-full-lines --strict-whitespace
 
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-EMPTY
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/01_string/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/01_string/sample.itest
index 0490605..27bea91 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/01_string/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/01_string/sample.itest
@@ -1,4 +1,4 @@
-; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" --match-full-lines --strict-whitespace 2>&1; test $? = 0;) | %FILECHECK_TESTER_EXEC %s --match-full-lines --strict-whitespace
+; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" --match-full-lines --strict-whitespace 2>&1; test $? = 0;) | %FILECHECK_TESTER_EXEC "%s" --match-full-lines --strict-whitespace
 
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-EMPTY:
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 0490605..27bea91 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,4 +1,4 @@
-; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" --match-full-lines --strict-whitespace 2>&1; test $? = 0;) | %FILECHECK_TESTER_EXEC %s --match-full-lines --strict-whitespace
+; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" --match-full-lines --strict-whitespace 2>&1; test $? = 0;) | %FILECHECK_TESTER_EXEC "%s" --match-full-lines --strict-whitespace
 
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-EMPTY:
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/03_string_negative/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/03_string_negative/sample.itest
index 63cf27d..05f1328 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/03_string_negative/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/03_string_negative/sample.itest
@@ -1,4 +1,4 @@
-; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" --match-full-lines --strict-whitespace 2>&1; test $? = 1;) | %FILECHECK_TESTER_EXEC %s --match-full-lines --strict-whitespace
+; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" --match-full-lines --strict-whitespace 2>&1; test $? = 1;) | %FILECHECK_TESTER_EXEC "%s" --match-full-lines --strict-whitespace
 
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; TODO: Is this FileCheck bug? (caret is -1 wrong and therefore position is either 9 or 10)
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/04_regex_negative/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/04_regex_negative/sample.itest
index 09be335..9b544ed 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/04_regex_negative/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/04_regex_negative/sample.itest
@@ -1,4 +1,4 @@
-; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" --match-full-lines --strict-whitespace 2>&1; test $? = 1;) | %FILECHECK_TESTER_EXEC %s --match-full-lines --strict-whitespace
+; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" --match-full-lines --strict-whitespace 2>&1; test $? = 1;) | %FILECHECK_TESTER_EXEC "%s" --match-full-lines --strict-whitespace
 
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; TODO: Is this FileCheck bug? (caret is -1 wrong and therefore position is either 9 or 10)
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 833abcd..0c508bc 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" | %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC %s --match-full-lines -check-prefix=NO_OPTION
-; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace 2>&1; test $? = 1) | %FILECHECK_TESTER_EXEC %s --match-full-lines -check-prefix=OPTION
+; RUN: cat "%S/filecheck.input" | %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines -check-prefix=NO_OPTION
+; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace 2>&1; test $? = 1) | %FILECHECK_TESTER_EXEC "%s" --match-full-lines -check-prefix=OPTION
 
 ; NO_OPTION: {{^.*}}FileCheck{{(\.py)?$}}
 ; NO_OPTION-EMPTY:
diff --git a/tests/integration/tests/options/--strict-whitespace/CHECK/02_check_has_mixed_spaces_and_tabs/sample.itest b/tests/integration/tests/options/--strict-whitespace/CHECK/02_check_has_mixed_spaces_and_tabs/sample.itest
index 7aa08a6..f658e8d 100644
--- a/tests/integration/tests/options/--strict-whitespace/CHECK/02_check_has_mixed_spaces_and_tabs/sample.itest
+++ b/tests/integration/tests/options/--strict-whitespace/CHECK/02_check_has_mixed_spaces_and_tabs/sample.itest
@@ -1,5 +1,5 @@
-; RUN: cat "%S/filecheck.input" | %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC %s --match-full-lines -check-prefix=NO_OPTION
-; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace 2>&1; test $? = 1) | %FILECHECK_TESTER_EXEC %s --strict-whitespace --match-full-lines -check-prefix=OPTION
+; RUN: cat "%S/filecheck.input" | %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines -check-prefix=NO_OPTION
+; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace 2>&1; test $? = 1) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines -check-prefix=OPTION
 
 ; NO_OPTION: {{^.*}}FileCheck{{(\.py)?$}}
 ; NO_OPTION-EMPTY:
diff --git a/tests/integration/tests/options/--strict-whitespace/CHECK_NOT/01_input_has_mixed_spaces_and_tabs/sample.itest b/tests/integration/tests/options/--strict-whitespace/CHECK_NOT/01_input_has_mixed_spaces_and_tabs/sample.itest
index c41fef3..f08cf19 100644
--- a/tests/integration/tests/options/--strict-whitespace/CHECK_NOT/01_input_has_mixed_spaces_and_tabs/sample.itest
+++ b/tests/integration/tests/options/--strict-whitespace/CHECK_NOT/01_input_has_mixed_spaces_and_tabs/sample.itest
@@ -1,5 +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 -check-prefix=NO_OPTION
-; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace 2>&1; test $? = 0) | %FILECHECK_TESTER_EXEC %s --match-full-lines -check-prefix=OPTION
+; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 1) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines -check-prefix=NO_OPTION
+; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace 2>&1; test $? = 0) | %FILECHECK_TESTER_EXEC "%s" --match-full-lines -check-prefix=OPTION
 
 ; NO_OPTION:{{^.*}}FileCheck{{(\.py)?$}}
 ; NO_OPTION:{{^.*}}filecheck.check:1:14: error: CHECK-NOT: excluded string found in input{{$}}
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 7aa08a6..f658e8d 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" | %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC %s --match-full-lines -check-prefix=NO_OPTION
-; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace 2>&1; test $? = 1) | %FILECHECK_TESTER_EXEC %s --strict-whitespace --match-full-lines -check-prefix=OPTION
+; RUN: cat "%S/filecheck.input" | %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines -check-prefix=NO_OPTION
+; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace 2>&1; test $? = 1) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines -check-prefix=OPTION
 
 ; NO_OPTION: {{^.*}}FileCheck{{(\.py)?$}}
 ; NO_OPTION-EMPTY:
diff --git a/tests/integration/tests/real_world_samples/FileCheck-manual/CHECK-EMPTY/sample.itest b/tests/integration/tests/real_world_samples/FileCheck-manual/CHECK-EMPTY/sample.itest
index d9fb89e..df24cf4 100644
--- a/tests/integration/tests/real_world_samples/FileCheck-manual/CHECK-EMPTY/sample.itest
+++ b/tests/integration/tests/real_world_samples/FileCheck-manual/CHECK-EMPTY/sample.itest
@@ -1,3 +1,3 @@
-; RUN: cat "%S/filecheck.input" | %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC %s --match-full-lines
+; RUN: cat "%S/filecheck.input" | %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-EMPTY:
diff --git a/tests/integration/tests/real_world_samples/mull/01-mull-scalar-operator-enum/sample.itest b/tests/integration/tests/real_world_samples/mull/01-mull-scalar-operator-enum/sample.itest
index fff593d..a51952d 100644
--- a/tests/integration/tests/real_world_samples/mull/01-mull-scalar-operator-enum/sample.itest
+++ b/tests/integration/tests/real_world_samples/mull/01-mull-scalar-operator-enum/sample.itest
@@ -1,3 +1,3 @@
-; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 0;) | %FILECHECK_TESTER_EXEC %s --strict-whitespace --match-full-lines
+; RUN: cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 0;) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-EMPTY:
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 50e6304..4545ba6 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,4 @@
-; 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" | (%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
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-NEXT:{{^.*}}filecheck.check:23:15: error: WITH-OPTION: expected string not found in input
 ; CHECK-NEXT:{{^; WITH-OPTION:..\^Running mutsants \\\(threads: 2\\\): 2\\\/2\.\*\$..$}}