diff --git a/CMakeLists.txt b/CMakeLists.txt
index 149b6fa64a..4036241b47 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,6 +60,14 @@ if(ENABLE_TESTS)
 	add_subdirectory(tests/ctest)
 endif()
 
+# gsrunner
+if(ENABLE_GSRUNNER)
+	if (NOT WIN32)
+		message(WARNING "GSRunner is only supported on Windows and may not build on your system")
+	endif()
+	add_subdirectory(pcsx2-gsrunner)
+endif()
+
 #-------------------------------------------------------------------------------
 if(NOT IS_SUPPORTED_COMPILER)
 	message(WARNING "
diff --git a/cmake/BuildParameters.cmake b/cmake/BuildParameters.cmake
index 31ffca414f..8741c56203 100644
--- a/cmake/BuildParameters.cmake
+++ b/cmake/BuildParameters.cmake
@@ -5,6 +5,7 @@ set(PCSX2_DEFS "")
 # Misc option
 #-------------------------------------------------------------------------------
 option(ENABLE_TESTS "Enables building the unit tests" ON)
+option(ENABLE_GSRUNNER "Enables building the GSRunner" OFF)
 option(LTO_PCSX2_CORE "Enable LTO/IPO/LTCG on the subset of pcsx2 that benefits most from it but not anything else")
 option(USE_VTUNE "Plug VTUNE to profile GS JIT.")