diff --git a/agb-tests/.cargo/config.toml b/agb-tests/.cargo/config.toml
deleted file mode 100644
index d5f7f86c..00000000
--- a/agb-tests/.cargo/config.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-[unstable]
-build-std = ["core", "alloc"]
-build-std-features = ["compiler-builtins-mem"]
-
-[build]
-target = "thumbv4t-none-eabi"
-
-[target.thumbv4t-none-eabi]
-rustflags = ["-Clink-arg=-T../agb/gba.ld", "-Ctarget-cpu=arm7tdmi"]
-runner = "mgba-test-runner"
-
-[target.armv4t-none-eabi]
-rustflags = ["-Clink-arg=-T../agb/gba.ld", "-Ctarget-cpu=arm7tdmi"]
-runner = "mgba-test-runner"
diff --git a/agb-tests/Cargo.toml b/agb-tests/Cargo.toml
deleted file mode 100644
index 9917f81b..00000000
--- a/agb-tests/Cargo.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[package]
-name = "agb-tests"
-version = "0.1.0"
-edition = "2018"
-
-[profile.dev]
-opt-level = 3
-debug = true
-
-[profile.release]
-lto = true
-debug = true
-
-[dependencies]
-agb = { version = "*", path = "../agb", features = ["testing"] }
-
-[package.metadata.docs.rs]
-default-target = "thumbv6m-none-eabi"
-targets = []
diff --git a/agb-tests/rust-toolchain.toml b/agb-tests/rust-toolchain.toml
deleted file mode 100644
index 06842486..00000000
--- a/agb-tests/rust-toolchain.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[toolchain]
-channel = "nightly"
-components = ["rust-src", "clippy"]
\ No newline at end of file
diff --git a/agb-tests/tests/save_test_common/mod.rs b/agb/tests/save_test_common/mod.rs
similarity index 100%
rename from agb-tests/tests/save_test_common/mod.rs
rename to agb/tests/save_test_common/mod.rs
diff --git a/agb-tests/tests/test_save_eeprom_512b.rs b/agb/tests/test_save_eeprom_512b.rs
similarity index 100%
rename from agb-tests/tests/test_save_eeprom_512b.rs
rename to agb/tests/test_save_eeprom_512b.rs
diff --git a/agb-tests/tests/test_save_eeprom_8k.rs b/agb/tests/test_save_eeprom_8k.rs
similarity index 100%
rename from agb-tests/tests/test_save_eeprom_8k.rs
rename to agb/tests/test_save_eeprom_8k.rs
diff --git a/agb-tests/tests/test_save_flash_128k.rs b/agb/tests/test_save_flash_128k.rs
similarity index 100%
rename from agb-tests/tests/test_save_flash_128k.rs
rename to agb/tests/test_save_flash_128k.rs
diff --git a/agb-tests/tests/test_save_flash_64k.rs b/agb/tests/test_save_flash_64k.rs
similarity index 100%
rename from agb-tests/tests/test_save_flash_64k.rs
rename to agb/tests/test_save_flash_64k.rs
diff --git a/agb-tests/tests/test_save_sram.rs b/agb/tests/test_save_sram.rs
similarity index 100%
rename from agb-tests/tests/test_save_sram.rs
rename to agb/tests/test_save_sram.rs
diff --git a/justfile b/justfile
index ba8f243c..23837d70 100644
--- a/justfile
+++ b/justfile
@@ -13,7 +13,6 @@ clippy:
 
 test:
     just _test-debug agb
-    just _test-debug agb-tests
     just _test-debug agb-fixnum
     just _test-debug-arm agb
     just _test-debug tools
@@ -21,8 +20,6 @@ test:
 test-release:
     just _test-release agb
     just _test-release-arm agb
-    just _test-release agb-tests
-    just _test-release-arm agb-tests
 
 doctest-agb:
     (cd agb && cargo test --doc -Z doctest-xcompile)