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 88fb498..6de377c 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 31e9b7c..77b5a80 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 31e9b7c..77b5a80 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 2885874..f2de394 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 c0dbd18..fc032d3 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 c356e50..982ec31 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 35bc555..e27d0b3 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 ec4af99..0532b7b 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 08417a9..340b39b 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 0abf17a..fff593d 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 26992b4..1b4bc9a 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 36536e4..3cdb428 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 c332a25..7662ddf 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 9bb91b5..9dcc0e8 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 8cea192..fac1623 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 9c94961..4e3bb32 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 a72fac2..d584e9d 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 47f0122..94f99c4 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 ad6316f..87e5766 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 58e9126..588f28c 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 58e9126..588f28c 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 58e9126..588f28c 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/failure/09-not-enough-input-for-all-checks/CHECK.itest b/tests/integration/tests/check_commands/CHECK/failure/09-not-enough-input-for-all-checks/CHECK.itest
index fdcb0c9..6a5f5f8 100644
--- a/tests/integration/tests/check_commands/CHECK/failure/09-not-enough-input-for-all-checks/CHECK.itest
+++ b/tests/integration/tests/check_commands/CHECK/failure/09-not-enough-input-for-all-checks/CHECK.itest
@@ -1,4 +1,4 @@
-; RUN: printf "String1" | (%FILECHECK_EXEC %S/CHECK.check 2>&1; test $? = 1;) | %FILECHECK_EXEC %s --strict-whitespace --match-full-lines
+; RUN: printf "String1" | (%FILECHECK_EXEC "%S/CHECK.check" 2>&1; test $? = 1;) | %FILECHECK_EXEC "%s" --strict-whitespace --match-full-lines
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 // TODO: Something wrong with the greediness here:
 ; CHECK***:{{^.*}}CHECK.check:2:8: error: CHECK***: expected string not found in input
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 4d7df67..b90a88f 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 79f54cb..4459a00 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 a4d73b8..98bb2e2 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 cee4816..22097b0 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 26bf76b..597fe94 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 5b3fab4..3c47c68 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 ea55974..b3fd4c0 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 1103716..3a5da7a 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 f84d401..4d99204 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 085a589..1e837e7 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 3db5499..9419a9a 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 a6be383..d9fb89e 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 a6be383..d9fb89e 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 ea55974..b3fd4c0 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 085a589..1e837e7 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/examples/check-commands/CHECK-EMPTY/Success/CHECK-EMPTY.itest b/tests/integration/tests/examples/check-commands/CHECK-EMPTY/Success/CHECK-EMPTY.itest
index e6197d9..56932f2 100644
--- a/tests/integration/tests/examples/check-commands/CHECK-EMPTY/Success/CHECK-EMPTY.itest
+++ b/tests/integration/tests/examples/check-commands/CHECK-EMPTY/Success/CHECK-EMPTY.itest
@@ -1,3 +1,3 @@
-; RUN: printf "String1\n\nString2" | %FILECHECK_EXEC %S/CHECK-EMPTY.check | %FILECHECK_EXEC %s
+; RUN: printf "String1\n\nString2" | %FILECHECK_EXEC %S/CHECK-EMPTY.check | %FILECHECK_EXEC "%s"
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-EMPTY:
diff --git a/tests/integration/tests/examples/check-commands/CHECK-NEXT/Failure/CHECK-NEXT.itest b/tests/integration/tests/examples/check-commands/CHECK-NEXT/Failure/CHECK-NEXT.itest
index e59f9dc..1fc860b 100644
--- a/tests/integration/tests/examples/check-commands/CHECK-NEXT/Failure/CHECK-NEXT.itest
+++ b/tests/integration/tests/examples/check-commands/CHECK-NEXT/Failure/CHECK-NEXT.itest
@@ -1,4 +1,4 @@
-; RUN: printf "String1\nfoo\nString2" | (%FILECHECK_EXEC %S/CHECK-NEXT.check 2>&1; test $? = 1;) | %FILECHECK_EXEC %s
+; RUN: printf "String1\nfoo\nString2" | (%FILECHECK_EXEC %S/CHECK-NEXT.check 2>&1; test $? = 1;) | %FILECHECK_EXEC "%s"
 
 ; CHECK: {{.*}}CHECK-NEXT.check:2:13: error: CHECK-NEXT: is not on the line after the previous match
 ; CHECK: CHECK-NEXT: String2
diff --git a/tests/integration/tests/examples/check-commands/CHECK-NEXT/Success/CHECK-NEXT.itest b/tests/integration/tests/examples/check-commands/CHECK-NEXT/Success/CHECK-NEXT.itest
index 29f9ca7..5675101 100644
--- a/tests/integration/tests/examples/check-commands/CHECK-NEXT/Success/CHECK-NEXT.itest
+++ b/tests/integration/tests/examples/check-commands/CHECK-NEXT/Success/CHECK-NEXT.itest
@@ -1,3 +1,3 @@
-; RUN: printf "String1\nString2" | %FILECHECK_EXEC %S/CHECK-NEXT.check | %FILECHECK_EXEC %s
+; RUN: printf "String1\nString2" | %FILECHECK_EXEC %S/CHECK-NEXT.check | %FILECHECK_EXEC "%s"
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-EMPTY:
diff --git a/tests/integration/tests/examples/check-commands/CHECK-NOT/Failure/CHECK-NOT.itest b/tests/integration/tests/examples/check-commands/CHECK-NOT/Failure/CHECK-NOT.itest
index 5e2ff73..131f874 100644
--- a/tests/integration/tests/examples/check-commands/CHECK-NOT/Failure/CHECK-NOT.itest
+++ b/tests/integration/tests/examples/check-commands/CHECK-NOT/Failure/CHECK-NOT.itest
@@ -1,4 +1,4 @@
-; RUN: printf "String3" | (%FILECHECK_EXEC %S/CHECK-NOT.check 2>&1; test $? = 1;) | %FILECHECK_EXEC %s
+; RUN: printf "String3" | (%FILECHECK_EXEC %S/CHECK-NOT.check 2>&1; test $? = 1;) | %FILECHECK_EXEC "%s"
 ; CHECK: {{.*}}CHECK-NOT.check:3:12: error: CHECK-NOT: excluded string found in input
 ; CHECK: CHECK-NOT: String3
 ; CHECK:            ^
diff --git a/tests/integration/tests/examples/check-commands/CHECK-NOT/Success/CHECK-NOT.itest b/tests/integration/tests/examples/check-commands/CHECK-NOT/Success/CHECK-NOT.itest
index 459d706..c985f92 100644
--- a/tests/integration/tests/examples/check-commands/CHECK-NOT/Success/CHECK-NOT.itest
+++ b/tests/integration/tests/examples/check-commands/CHECK-NOT/Success/CHECK-NOT.itest
@@ -1,3 +1,3 @@
-; RUN: printf "String4" | %FILECHECK_EXEC %S/CHECK-NOT.check | %FILECHECK_EXEC %s
+; RUN: printf "String4" | %FILECHECK_EXEC %S/CHECK-NOT.check | %FILECHECK_EXEC "%s"
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-EMPTY:
diff --git a/tests/integration/tests/examples/check-commands/CHECK/Failure/CHECK.itest b/tests/integration/tests/examples/check-commands/CHECK/Failure/CHECK.itest
index 305a7b6..37c9849 100644
--- a/tests/integration/tests/examples/check-commands/CHECK/Failure/CHECK.itest
+++ b/tests/integration/tests/examples/check-commands/CHECK/Failure/CHECK.itest
@@ -1,4 +1,4 @@
-; RUN: printf "String1" | (%FILECHECK_EXEC %S/CHECK.check 2>&1; test $? = 1;) | %FILECHECK_EXEC %s
+; RUN: printf "String1" | (%FILECHECK_EXEC "%S/CHECK.check" 2>&1; test $? = 1;) | %FILECHECK_EXEC "%s"
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK: {{.*}}CHECK.check:2:8: error: CHECK: expected string not found in input
 ; CHECK: CHECK: String2
diff --git a/tests/integration/tests/examples/check-commands/CHECK/Success/CHECK.itest b/tests/integration/tests/examples/check-commands/CHECK/Success/CHECK.itest
index b2427db..2cbdecc 100644
--- a/tests/integration/tests/examples/check-commands/CHECK/Success/CHECK.itest
+++ b/tests/integration/tests/examples/check-commands/CHECK/Success/CHECK.itest
@@ -1,3 +1,3 @@
-; RUN: printf "String1\nString2\nString3" | %FILECHECK_EXEC %S/CHECK.check | %FILECHECK_EXEC %s
+; RUN: printf "String1\nString2\nString3" | %FILECHECK_EXEC "%S/CHECK.check" | %FILECHECK_EXEC "%s"
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-EMPTY:
diff --git a/tests/integration/tests/examples/options/--check-prefix/--check-prefix.itest b/tests/integration/tests/examples/options/--check-prefix/--check-prefix.itest
index 51010a7..2d3165a 100644
--- a/tests/integration/tests/examples/options/--check-prefix/--check-prefix.itest
+++ b/tests/integration/tests/examples/options/--check-prefix/--check-prefix.itest
@@ -1,4 +1,4 @@
-; RUN: printf "String1" | %FILECHECK_EXEC %s --check-prefix STRING1
-; RUN: printf "String2" | %FILECHECK_EXEC %s --check-prefix STRING2
+; RUN: printf "String1" | %FILECHECK_EXEC "%s" --check-prefix STRING1
+; RUN: printf "String2" | %FILECHECK_EXEC "%s" --check-prefix STRING2
 ; STRING1: String1
 ; STRING2: String2
diff --git a/tests/integration/tests/examples/options/--match-full-lines/without--match-full-lines.itest b/tests/integration/tests/examples/options/--match-full-lines/without--match-full-lines.itest
index f07489e..7053084 100644
--- a/tests/integration/tests/examples/options/--match-full-lines/without--match-full-lines.itest
+++ b/tests/integration/tests/examples/options/--match-full-lines/without--match-full-lines.itest
@@ -1,3 +1,3 @@
-; RUN: printf "String1\nString2\nString3" | %FILECHECK_EXEC %S/without--match-full-lines.check | %FILECHECK_EXEC %s
+; RUN: printf "String1\nString2\nString3" | %FILECHECK_EXEC %S/without--match-full-lines.check | %FILECHECK_EXEC "%s"
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-EMPTY:
diff --git a/tests/integration/tests/examples/options/--strict-whitespace/without--strict-whitespace.itest b/tests/integration/tests/examples/options/--strict-whitespace/without--strict-whitespace.itest
index 5fee25a..c485164 100644
--- a/tests/integration/tests/examples/options/--strict-whitespace/without--strict-whitespace.itest
+++ b/tests/integration/tests/examples/options/--strict-whitespace/without--strict-whitespace.itest
@@ -1,5 +1,5 @@
-; RUN: printf "String1 String2 String3" | %FILECHECK_EXEC %S/without--strict-whitespace.check | %FILECHECK_EXEC %s
-; RUN: printf "String1  String2          String3" | %FILECHECK_EXEC %S/without--strict-whitespace.check | %FILECHECK_EXEC %s
-; RUN: printf "   String1\tString2\t\t\tString3 " | %FILECHECK_EXEC %S/without--strict-whitespace.check | %FILECHECK_EXEC %s
+; RUN: printf "String1 String2 String3" | %FILECHECK_EXEC %S/without--strict-whitespace.check | %FILECHECK_EXEC "%s"
+; RUN: printf "String1  String2          String3" | %FILECHECK_EXEC %S/without--strict-whitespace.check | %FILECHECK_EXEC "%s"
+; RUN: printf "   String1\tString2\t\t\tString3 " | %FILECHECK_EXEC %S/without--strict-whitespace.check | %FILECHECK_EXEC "%s"
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-EMPTY:
diff --git a/tests/integration/tests/examples/options/strict-mode/strict-mode.itest b/tests/integration/tests/examples/options/strict-mode/strict-mode.itest
index d2f1c20..8d9881f 100644
--- a/tests/integration/tests/examples/options/strict-mode/strict-mode.itest
+++ b/tests/integration/tests/examples/options/strict-mode/strict-mode.itest
@@ -1,3 +1,3 @@
-; RUN: printf "String1\nString2\nString3" | %FILECHECK_EXEC %S/strict-mode.check --strict-whitespace --match-full-lines | %FILECHECK_EXEC %s --strict-whitespace --match-full-lines
+; RUN: printf "String1\nString2\nString3" | %FILECHECK_EXEC %S/strict-mode.check --strict-whitespace --match-full-lines | %FILECHECK_EXEC "%s" --strict-whitespace --match-full-lines
 ; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
 ; 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 cf25f87..b3b92a0 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 cf25f87..b3b92a0 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 fe1784b..5ce960a 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 886508d..071ce8f 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 1b189ef..a6dea2c 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 3daddc4..fe93609 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 b2110ec..611b298 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/--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 8e5771d..8787b63 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 a9de207..d18d8aa 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 411cffa..eb89802 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 2b8cbd2..0490605 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 2b8cbd2..0490605 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 96f7d6e..63cf27d 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 5bca68f..09be335 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 e4878b2..833abcd 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 23f6a10..7aa08a6 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 aca4bad..c41fef3 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 23f6a10..7aa08a6 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 a6be383..d9fb89e 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 0abf17a..fff593d 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 8c502c9..50e6304 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\.\*\$..$}}