diff --git a/Cargo.lock b/Cargo.lock
index e4af13a098..46cb7c256e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -362,8 +362,9 @@ dependencies = [
 
 [[package]]
 name = "compiletest_rs"
-version = "0.6.0"
-source = "git+https://github.com/Manishearth/compiletest-rs.git?rev=9257f6d#9257f6dd0a9687dd36897684ae18a124ac34016b"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64698e5e2435db061a85e6320af12c30c5fd88eb84b35d2c1e03ce4f143255ca"
 dependencies = [
  "diff",
  "filetime",
diff --git a/Cargo.toml b/Cargo.toml
index 8fa5f448c4..c2fd7f3bd3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -38,7 +38,3 @@ codegen-units = 256
 [patch.crates-io]
 spirv-std = { path = "./crates/spirv-std" }
 spirv-std-macros = { path = "./crates/spirv-std/macros" }
-# TODO: Remove once next version is released - needed to include these two PRs:
-# * Manishearth/compiletest-rs#240 (for handling SPIR-V extension across platforms)
-# * Manishearth/compiletest-rs#241 (for the `$TEST_BUILD_DIR` path normalization)
-compiletest_rs = { git = "https://github.com/Manishearth/compiletest-rs.git", rev = "9257f6d" }
diff --git a/tests/Cargo.toml b/tests/Cargo.toml
index afd58256ea..0cd9ce6a9b 100644
--- a/tests/Cargo.toml
+++ b/tests/Cargo.toml
@@ -13,6 +13,6 @@ use-installed-tools = ["rustc_codegen_spirv/use-installed-tools"]
 use-compiled-tools = ["rustc_codegen_spirv/use-compiled-tools"]
 
 [dependencies]
-compiletest = { version = "0.6.0", package = "compiletest_rs" }
+compiletest = { version = "0.7.0", package = "compiletest_rs" }
 rustc_codegen_spirv = { path = "../crates/rustc_codegen_spirv", default-features = false }
 structopt = "0.3.21"