diff --git a/Source/Tools/CMakeLists.txt b/Source/Tools/CMakeLists.txt
index e45d1f992..16e9b9002 100644
--- a/Source/Tools/CMakeLists.txt
+++ b/Source/Tools/CMakeLists.txt
@@ -26,3 +26,7 @@ if (NOT MINGW_BUILD)
 endif()
 
 add_subdirectory(FEXLoader/)
+
+if (BUILD_TESTS)
+  add_subdirectory(TestHarnessRunner/)
+endif()
diff --git a/Source/Tools/FEXLoader/CMakeLists.txt b/Source/Tools/FEXLoader/CMakeLists.txt
index 11d8e5940..0ccdeefc3 100644
--- a/Source/Tools/FEXLoader/CMakeLists.txt
+++ b/Source/Tools/FEXLoader/CMakeLists.txt
@@ -157,25 +157,3 @@ if (NOT MINGW_BUILD)
     )
   endif()
 endif()
-
-if (BUILD_TESTS)
-  set (SRCS TestHarnessRunner.cpp)
-  if (NOT MINGW_BUILD)
-    list(APPEND SRCS TestHarnessRunner/HostRunner.cpp)
-    list(APPEND LIBS LinuxEmulation CommonTools)
-  endif()
-
-  add_executable(TestHarnessRunner ${SRCS})
-  target_compile_definitions(TestHarnessRunner PRIVATE ${DEFINES})
-
-  target_include_directories(TestHarnessRunner
-    PRIVATE
-      ${CMAKE_CURRENT_SOURCE_DIR}/Source/
-      ${CMAKE_BINARY_DIR}/generated
-  )
-  target_link_libraries(TestHarnessRunner
-    PRIVATE
-      ${LIBS}
-      ${PTHREAD_LIB}
-  )
-endif()
diff --git a/Source/Tools/TestHarnessRunner/CMakeLists.txt b/Source/Tools/TestHarnessRunner/CMakeLists.txt
new file mode 100644
index 000000000..d18bd0a01
--- /dev/null
+++ b/Source/Tools/TestHarnessRunner/CMakeLists.txt
@@ -0,0 +1,24 @@
+list(APPEND LIBS FEXCore Common)
+
+set (SRCS TestHarnessRunner.cpp)
+if (NOT MINGW_BUILD)
+  list(APPEND SRCS TestHarnessRunner/HostRunner.cpp)
+  list(APPEND LIBS LinuxEmulation CommonTools)
+endif()
+
+add_executable(TestHarnessRunner ${SRCS})
+
+if (ENABLE_VIXL_SIMULATOR)
+  target_compile_definitions(TestHarnessRunner PRIVATE "-DVIXL_SIMULATOR=1")
+endif()
+
+target_include_directories(TestHarnessRunner
+  PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/Source/
+    ${CMAKE_BINARY_DIR}/generated
+)
+target_link_libraries(TestHarnessRunner
+  PRIVATE
+    ${LIBS}
+    ${PTHREAD_LIB}
+)
diff --git a/Source/Tools/FEXLoader/TestHarnessRunner.cpp b/Source/Tools/TestHarnessRunner/TestHarnessRunner.cpp
similarity index 100%
rename from Source/Tools/FEXLoader/TestHarnessRunner.cpp
rename to Source/Tools/TestHarnessRunner/TestHarnessRunner.cpp
diff --git a/Source/Tools/FEXLoader/TestHarnessRunner/HostRunner.cpp b/Source/Tools/TestHarnessRunner/TestHarnessRunner/HostRunner.cpp
similarity index 100%
rename from Source/Tools/FEXLoader/TestHarnessRunner/HostRunner.cpp
rename to Source/Tools/TestHarnessRunner/TestHarnessRunner/HostRunner.cpp
diff --git a/Source/Tools/FEXLoader/TestHarnessRunner/HostRunner.h b/Source/Tools/TestHarnessRunner/TestHarnessRunner/HostRunner.h
similarity index 100%
rename from Source/Tools/FEXLoader/TestHarnessRunner/HostRunner.h
rename to Source/Tools/TestHarnessRunner/TestHarnessRunner/HostRunner.h