diff --git a/test/known_good/multisample-depth_windows.gfxr b/test/known_good/multisample-depth_windows.gfxr
new file mode 100644
index 0000000000..58cb0114bf
Binary files /dev/null and b/test/known_good/multisample-depth_windows.gfxr differ
diff --git a/test/known_good/pipeline-binaries_windows.gfxr b/test/known_good/pipeline-binaries_windows.gfxr
new file mode 100644
index 0000000000..18c033b235
Binary files /dev/null and b/test/known_good/pipeline-binaries_windows.gfxr differ
diff --git a/test/known_good/shader-objects_windows.gfxr b/test/known_good/shader-objects_windows.gfxr
new file mode 100644
index 0000000000..c5d3378bc7
Binary files /dev/null and b/test/known_good/shader-objects_windows.gfxr differ
diff --git a/test/known_good/triangle_windows.gfxr b/test/known_good/triangle_windows.gfxr
new file mode 100644
index 0000000000..3ca5b7bbe3
Binary files /dev/null and b/test/known_good/triangle_windows.gfxr differ
diff --git a/test/run-tests.ps1 b/test/run-tests.ps1
index 8890b92f36..7f1815f8a2 100644
--- a/test/run-tests.ps1
+++ b/test/run-tests.ps1
@@ -19,7 +19,7 @@ $env:VK_LOADER_LAYERS_DISABLE="~all~"
 $env:VK_LOADER_LAYERS_ENABLE="*gfxreconstruct*"
 $env:GFXRECON_CAPTURE_FILE_TIMESTAMP="false"
 $env:GFXRECON_CAPTURE_FILE="actual.gfxr"
-$env:GFXRECON_TESTAPP_HEADLESS="true"
+#$env:GFXRECON_TESTAPP_HEADLESS="true"
 $env:GFXRECON_TESTAPP_MOCK_ICD="$pwd\test_apps\VkICD_mock_icd.dll"
 $env:GFXRECON_LOG_LEVEL="info"
 $env:VK_LOADER_DEBUG="all"
diff --git a/test/run-tests.sh b/test/run-tests.sh
index 1bd8918193..4abd1dea6a 100644
--- a/test/run-tests.sh
+++ b/test/run-tests.sh
@@ -9,8 +9,9 @@ GFXRECON_CAPTURE_FILE=actual.gfxr \
 VK_LOADER_LAYERS_DISABLE=~all~ \
 VK_LOADER_LAYERS_ENABLE=*gfxreconstruct* \
 DISPLAY=:0 \
-GFXRECON_TESTAPP_HEADLESS=true \
 GFXRECON_TESTAPP_MOCK_ICD="$PWD/test_apps/libVkICD_mock_icd.so" \
 GFXRECON_LOG_LEVEL="info" \
 VK_LOADER_DEBUG="all" \
-./gfxrecon-testapp-runner
\ No newline at end of file
+./gfxrecon-testapp-runner
+
+#GFXRECON_TESTAPP_HEADLESS=true \
diff --git a/test/run-tests_macos.sh b/test/run-tests_macos.sh
index 87f2c30acf..cc50a46c57 100644
--- a/test/run-tests_macos.sh
+++ b/test/run-tests_macos.sh
@@ -9,8 +9,9 @@ GFXRECON_CAPTURE_FILE=actual.gfxr \
 VK_LOADER_LAYERS_DISABLE=~implicit~ \
 VK_LOADER_LAYERS_ENABLE=VK_LAYER_LUNARG_gfxreconstruct \
 DISPLAY=:0 \
-GFXRECON_TESTAPP_HEADLESS=true \
 GFXRECON_TESTAPP_MOCK_ICD="$PWD/test_apps/libVkICD_mock_icd.dylib" \
 GFXRECON_LOG_LEVEL="info" \
 VK_LOADER_DEBUG="layer" \
-./gfxrecon-testapp-runner
\ No newline at end of file
+./gfxrecon-testapp-runner
+
+#GFXRECON_TESTAPP_HEADLESS=true \
diff --git a/test/test_cases/multisample-depth.cpp b/test/test_cases/multisample-depth.cpp
index e3f0658fc6..75da18ca7e 100644
--- a/test/test_cases/multisample-depth.cpp
+++ b/test/test_cases/multisample-depth.cpp
@@ -12,6 +12,8 @@ char const* const APP_PATH          = "gfxrecon-testapp-multisample-depth";
 
 #ifdef __APPLE__
 char const* const KNOWN_GFXR_PATH   = "multisample-depth_macos.gfxr";
+#elif WIN32
+char const* const KNOWN_GFXR_PATH   = "multisample-depth_windows.gfxr";
 #else
 char const* const KNOWN_GFXR_PATH   = "multisample-depth.gfxr";
 #endif
diff --git a/test/test_cases/pipeline-binaries.cpp b/test/test_cases/pipeline-binaries.cpp
index 7a9f777737..a620c668f2 100644
--- a/test/test_cases/pipeline-binaries.cpp
+++ b/test/test_cases/pipeline-binaries.cpp
@@ -12,6 +12,8 @@ char const* const APP_PATH          = "gfxrecon-testapp-pipeline-binaries";
 
 #ifdef __APPLE__
 char const* const KNOWN_GFXR_PATH   = "pipeline-binaries_macos.gfxr";
+#elif WIN32
+char const* const KNOWN_GFXR_PATH   = "pipeline-binaries_windows.gfxr";
 #else
 char const* const KNOWN_GFXR_PATH   = "pipeline-binaries.gfxr";
 #endif
diff --git a/test/test_cases/shader-objects.cpp b/test/test_cases/shader-objects.cpp
index a41013b98a..b289de8bd3 100644
--- a/test/test_cases/shader-objects.cpp
+++ b/test/test_cases/shader-objects.cpp
@@ -12,6 +12,8 @@ char const* const APP_PATH          = "gfxrecon-testapp-shader-objects";
 
 #ifdef __APPLE__
 char const* const KNOWN_GFXR_PATH   = "shader-objects_macos.gfxr";
+#elif WIN32
+char const* const KNOWN_GFXR_PATH   = "shader-objects_windows.gfxr";
 #else
 char const* const KNOWN_GFXR_PATH   = "shader-objects.gfxr";
 #endif
diff --git a/test/test_cases/triangle.cpp b/test/test_cases/triangle.cpp
index 5ce41885ca..f512a58730 100644
--- a/test/test_cases/triangle.cpp
+++ b/test/test_cases/triangle.cpp
@@ -12,6 +12,8 @@ char const* const APP_PATH          = "gfxrecon-testapp-triangle";
 
 #ifdef __APPLE__
 char const* const KNOWN_GFXR_PATH   = "triangle_macos.gfxr";
+#elif WIN32
+char const* const KNOWN_GFXR_PATH   = "triangle_windows.gfxr";
 #else
 char const* const KNOWN_GFXR_PATH   = "triangle.gfxr";
 #endif