diff --git a/tests/mos6502.addr.c b/tests/mos6502.addr.c
index e71b1f3..880c656 100644
--- a/tests/mos6502.addr.c
+++ b/tests/mos6502.addr.c
@@ -13,22 +13,6 @@ Test(mos6502_addr, mode)
     cr_assert_eq(mos6502_addr_mode(0xF0), REL);
 }
 
-Test(mos6502_addr, get_address_resolver)
-{
-    cr_assert_eq(mos6502_get_address_resolver(0x0A), mos6502_resolve_acc);
-    cr_assert_eq(mos6502_get_address_resolver(0x20), mos6502_resolve_abs);
-    cr_assert_eq(mos6502_get_address_resolver(0xBC), mos6502_resolve_abx);
-    cr_assert_eq(mos6502_get_address_resolver(0x19), mos6502_resolve_aby);
-    cr_assert_eq(mos6502_get_address_resolver(0xA0), mos6502_resolve_imm);
-    cr_assert_eq(mos6502_get_address_resolver(0x6C), mos6502_resolve_ind);
-    cr_assert_eq(mos6502_get_address_resolver(0x01), mos6502_resolve_idx);
-    cr_assert_eq(mos6502_get_address_resolver(0x11), mos6502_resolve_idy);
-    cr_assert_eq(mos6502_get_address_resolver(0x10), mos6502_resolve_rel);
-    cr_assert_eq(mos6502_get_address_resolver(0x05), mos6502_resolve_zpg);
-    cr_assert_eq(mos6502_get_address_resolver(0x15), mos6502_resolve_zpx);
-    cr_assert_eq(mos6502_get_address_resolver(0x96), mos6502_resolve_zpy);
-}
-
 Test(mos6502_addr, addr_mode_acc)
 {
     cpu->A = 123;
diff --git a/tests/mos6502.c b/tests/mos6502.c
index f7c71fa..8105488 100644
--- a/tests/mos6502.c
+++ b/tests/mos6502.c
@@ -160,3 +160,20 @@ Test(mos6502, flash_memory)
     cr_assert_eq(vm_segment_get(cpu->memory, 0), 123);
     cr_assert_eq(vm_segment_get(cpu->memory, 1), 124);
 }
+
+Test(mos6502, get_address_resolver)
+{
+    cr_assert_eq(mos6502_get_address_resolver(0x0A), mos6502_resolve_acc);
+    cr_assert_eq(mos6502_get_address_resolver(0x20), mos6502_resolve_abs);
+    cr_assert_eq(mos6502_get_address_resolver(0xBC), mos6502_resolve_abx);
+    cr_assert_eq(mos6502_get_address_resolver(0x19), mos6502_resolve_aby);
+    cr_assert_eq(mos6502_get_address_resolver(0xA0), mos6502_resolve_imm);
+    cr_assert_eq(mos6502_get_address_resolver(0x6C), mos6502_resolve_ind);
+    cr_assert_eq(mos6502_get_address_resolver(0x01), mos6502_resolve_idx);
+    cr_assert_eq(mos6502_get_address_resolver(0x11), mos6502_resolve_idy);
+    cr_assert_eq(mos6502_get_address_resolver(0x10), mos6502_resolve_rel);
+    cr_assert_eq(mos6502_get_address_resolver(0x05), mos6502_resolve_zpg);
+    cr_assert_eq(mos6502_get_address_resolver(0x15), mos6502_resolve_zpx);
+    cr_assert_eq(mos6502_get_address_resolver(0x96), mos6502_resolve_zpy);
+}
+