diff --git a/Makefile b/Makefile
index 416d9d2..a55f718 100644
--- a/Makefile
+++ b/Makefile
@@ -27,14 +27,28 @@ test-lit-py: ## Run tests against FileCheck.py.
 		lit \
 		-vv $(PWD)/tests/integration
 
-FILECHECK_REAL_EXEC=$(PWD)/tests/integration/tools/FileCheck/FileCheck
-test-lit-real: ## Run tests against FileCheck C++.
-	@echo "--- Running integration tests against FileCheck C++ ---"
+test-lit-real: test-lit-real-8 test-lit-real-9 ## Run tests against FileCheck C++.
+
+FILECHECK_REAL_8_EXEC=$(PWD)/tests/integration/tools/FileCheck/FileCheck-8.0.1
+test-lit-real-8: ## Run tests against LLVM FileCheck 8.
+	@echo "--- Running integration tests against LLVM FileCheck 8.0.1 ---"
+	cd tests/integration && make clean
+
+	CURRENT_DIR=$(PWD) \
+		REAL_ONLY=1 \
+		FILECHECK_EXEC=$(FILECHECK_REAL_8_EXEC) \
+		PATH=$(PWD)/tests/integration/tools/FileCheck:$(PWD)/tests/integration/tools:$$PATH \
+		lit \
+		-vv $(PWD)/tests/integration
+
+FILECHECK_REAL_9_EXEC=$(PWD)/tests/integration/tools/FileCheck/FileCheck-9.0.1
+test-lit-real-9: ## Run tests against LLVM FileCheck 9.
+	@echo "--- Running integration tests against LLVM FileCheck 9.0.1 ---"
 	cd tests/integration && make clean
 
 	CURRENT_DIR=$(PWD) \
 		REAL_ONLY=1 \
-		FILECHECK_EXEC=$(FILECHECK_REAL_EXEC) \
+		FILECHECK_EXEC=$(FILECHECK_REAL_9_EXEC) \
 		PATH=$(PWD)/tests/integration/tools/FileCheck:$(PWD)/tests/integration/tools:$$PATH \
 		lit \
 		-vv $(PWD)/tests/integration
diff --git a/tests/integration/tools/FileCheck/FileCheck b/tests/integration/tools/FileCheck/FileCheck
index 3964322..735c54c 100755
--- a/tests/integration/tools/FileCheck/FileCheck
+++ b/tests/integration/tools/FileCheck/FileCheck
@@ -2,12 +2,4 @@
 
 file_check_path=`echo $(cd $(dirname "$0") && pwd -P)`
 
-echo $file_check_path
-
-if [[ "$OSTYPE" == "linux-gnu" ]]; then
-  $file_check_path/FileCheck-Linux "$@"
-elif [[ "$OSTYPE" == "darwin"* ]]; then
-  $file_check_path/FileCheck-macOS "$@"
-else
-  exit 1
-fi
+$file_check_path/FileCheck-9.0.1 "$@"
diff --git a/tests/integration/tools/FileCheck/FileCheck-8.0.1 b/tests/integration/tools/FileCheck/FileCheck-8.0.1
new file mode 100755
index 0000000..83589f7
--- /dev/null
+++ b/tests/integration/tools/FileCheck/FileCheck-8.0.1
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+file_check_path=`echo $(cd $(dirname "$0") && pwd -P)`
+
+echo $file_check_path
+
+if [[ "$OSTYPE" == "linux-gnu" ]]; then
+  $file_check_path/FileCheck-8.0.1-Linux "$@"
+elif [[ "$OSTYPE" == "darwin"* ]]; then
+  $file_check_path/FileCheck-8.0.1-macOS "$@"
+else
+  exit 1
+fi
diff --git a/tests/integration/tools/FileCheck/FileCheck-Linux b/tests/integration/tools/FileCheck/FileCheck-8.0.1-Linux
similarity index 100%
rename from tests/integration/tools/FileCheck/FileCheck-Linux
rename to tests/integration/tools/FileCheck/FileCheck-8.0.1-Linux
diff --git a/tests/integration/tools/FileCheck/FileCheck-macOS b/tests/integration/tools/FileCheck/FileCheck-8.0.1-macOS
similarity index 100%
rename from tests/integration/tools/FileCheck/FileCheck-macOS
rename to tests/integration/tools/FileCheck/FileCheck-8.0.1-macOS
diff --git a/tests/integration/tools/FileCheck/FileCheck-9.0.1 b/tests/integration/tools/FileCheck/FileCheck-9.0.1
new file mode 100755
index 0000000..b38ce4e
--- /dev/null
+++ b/tests/integration/tools/FileCheck/FileCheck-9.0.1
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+file_check_path=`echo $(cd $(dirname "$0") && pwd -P)`
+
+echo $file_check_path
+
+if [[ "$OSTYPE" == "linux-gnu" ]]; then
+  $file_check_path/FileCheck-9.0.1-Linux "$@"
+elif [[ "$OSTYPE" == "darwin"* ]]; then
+  $file_check_path/FileCheck-9.0.1-macOS "$@"
+else
+  exit 1
+fi
diff --git a/tests/integration/tools/FileCheck/FileCheck-9.0.1-Linux b/tests/integration/tools/FileCheck/FileCheck-9.0.1-Linux
new file mode 100755
index 0000000..1e3ae06
Binary files /dev/null and b/tests/integration/tools/FileCheck/FileCheck-9.0.1-Linux differ
diff --git a/tests/integration/tools/FileCheck/FileCheck-9.0.1-macOS b/tests/integration/tools/FileCheck/FileCheck-9.0.1-macOS
new file mode 100755
index 0000000..f249034
Binary files /dev/null and b/tests/integration/tools/FileCheck/FileCheck-9.0.1-macOS differ