diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 113eef39c..a0986a73c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -98,9 +98,8 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@nightly
         with:
+          targets: x86_64-unknown-none
           components: rust-src, llvm-tools
-      - name: "Install cargo-xbuild"
-        run: cargo install cargo-xbuild --debug --root binaries
       - name: "Install bootimage"
         run: cargo install bootimage --debug --root binaries
 
@@ -128,7 +127,7 @@ jobs:
         run: qemu-system-x86_64 --version
 
       - name: "Run Test Framework"
-        run: cargo xtest
+        run: cargo test
         shell: bash
         working-directory: "testing"
 
diff --git a/testing/.cargo/config b/testing/.cargo/config
deleted file mode 100644
index e29dc09f8..000000000
--- a/testing/.cargo/config
+++ /dev/null
@@ -1,5 +0,0 @@
-[build]
-target = "x86_64-bare-metal.json"
-
-[target.'cfg(target_os = "none")']
-runner = "bootimage runner"
diff --git a/testing/.cargo/config.toml b/testing/.cargo/config.toml
new file mode 100644
index 000000000..5c19ef08b
--- /dev/null
+++ b/testing/.cargo/config.toml
@@ -0,0 +1,6 @@
+[build]
+target = "x86_64-unknown-none"
+rustflags = ["-Crelocation-model=static"]
+
+[target.'cfg(target_os = "none")']
+runner = "bootimage runner"
diff --git a/testing/x86_64-bare-metal.json b/testing/x86_64-bare-metal.json
deleted file mode 100644
index 21c9e03cd..000000000
--- a/testing/x86_64-bare-metal.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "llvm-target": "x86_64-unknown-none",
-  "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
-  "arch": "x86_64",
-  "target-endian": "little",
-  "target-pointer-width": "64",
-  "target-c-int-width": "32",
-  "os": "none",
-  "executables": true,
-  "linker-flavor": "ld.lld",
-  "linker": "rust-lld",
-  "panic-strategy": "abort",
-  "disable-redzone": true,
-  "features": "-mmx,-sse,+soft-float"
-}