diff --git a/modules/rostests/rosautotest/CConfiguration.cpp b/modules/rostests/rosautotest/CConfiguration.cpp
index 8eee32dbb29..0475ab2ae9c 100644
--- a/modules/rostests/rosautotest/CConfiguration.cpp
+++ b/modules/rostests/rosautotest/CConfiguration.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "precomp.h"
+#include <versionhelpers.h>
 
 #define CONFIGURATION_FILENAMEA   "rosautotest.ini"
 #define CONFIGURATION_FILENAMEW   L"rosautotest.ini"
@@ -32,6 +33,7 @@ CConfiguration::CConfiguration()
         FATAL("GetWindowsDirectoryW failed\n");
 
     m_IsReactOS = !_wcsnicmp(&WindowsDirectory[3], L"reactos", 7);
+    m_IsReactOS = m_IsReactOS || IsReactOS();
 
     if(GetEnvironmentVariableW(L"WINETEST_INTERACTIVE", Interactive, _countof(Interactive)))
         m_IsInteractive = _wtoi(Interactive);
diff --git a/sdk/include/psdk/versionhelpers.h b/sdk/include/psdk/versionhelpers.h
index 339a4d0cda4..c13a2c8f595 100644
--- a/sdk/include/psdk/versionhelpers.h
+++ b/sdk/include/psdk/versionhelpers.h
@@ -145,12 +145,10 @@ IsActiveSessionCountLimited()
 }
 
 #ifdef __REACTOS__
+#include <mmtypes.h>
 VERSIONHELPERAPI
 IsReactOS()
 {
-    // FIXME: Find a better method!
-    WCHAR szWinDir[MAX_PATH];
-    GetWindowsDirectoryW(szWinDir, _countof(szWinDir));
-    return (wcsstr(szWinDir, L"ReactOS") != NULL);
+    return *(UINT*)(MM_SHARED_USER_DATA_VA + PAGE_SIZE - sizeof(ULONG)) == 0x8EAC705;
 }
 #endif // __REACTOS__