diff --git a/src/core/core.h b/src/core/core.h
index 81d0dfffd..365b8063c 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -276,12 +276,10 @@ private:
 
 public: // HACK: this is temporary exposed for tests,
         // due to WIP kernel refactor causing desync state in memory
+    std::unique_ptr<Memory::MemorySystem> memory;
     std::unique_ptr<Kernel::KernelSystem> kernel;
     std::unique_ptr<Timing> timing;
 
-    /// Memory system
-    std::unique_ptr<Memory::MemorySystem> memory;
-
 private:
     static System s_instance;
 
diff --git a/src/tests/core/arm/arm_test_common.cpp b/src/tests/core/arm/arm_test_common.cpp
index ff8f5406a..acadf4d53 100644
--- a/src/tests/core/arm/arm_test_common.cpp
+++ b/src/tests/core/arm/arm_test_common.cpp
@@ -40,6 +40,7 @@ TestEnvironment::~TestEnvironment() {
     Memory::MemorySystem& memory = *Core::System::GetInstance().memory;
     memory.UnmapRegion(*page_table, 0x80000000, 0x80000000);
     memory.UnmapRegion(*page_table, 0x00000000, 0x80000000);
+    Core::System::GetInstance().kernel.reset();
 }
 
 void TestEnvironment::SetMemory64(VAddr vaddr, u64 value) {