diff --git a/tests/src/AicaArmTest.cpp b/tests/src/AicaArmTest.cpp
index 431535846..478cd3e18 100644
--- a/tests/src/AicaArmTest.cpp
+++ b/tests/src/AicaArmTest.cpp
@@ -5,7 +5,6 @@
 #include "hw/aica/aica_if.h"
 #include "hw/arm7/arm7_rec.h"
 
-extern reg_pair arm_Reg[RN_ARM_REG_COUNT];
 extern bool Arm7Enabled;
 extern "C" void CompileCode();
 
@@ -18,6 +17,9 @@ static const u32 C_FLAG = 1 << 29;
 static const u32 V_FLAG = 1 << 28;
 static const u32 NZCV_MASK = N_FLAG | Z_FLAG | C_FLAG | V_FLAG;
 
+extern "C" void DYNACALL arm_mainloop(u32 cycl, void* regs, void* entrypoints);
+extern void *EntryPoints[];
+
 class AicaArmTest : public ::testing::Test {
 protected:
 	void SetUp() override {
@@ -47,7 +49,7 @@ protected:
 	{
 		arm_Reg[R15_ARM_NEXT].I = 0x1000;
 		arm_Reg[CYCL_CNT].I = 0;
-		arm_Run(1);
+		arm_mainloop(1, arm_Reg, EntryPoints);
 	}
 	void ResetNZCV()
 	{