diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 393da3aa89192758a398c844b50eb45bb288ecc9..b202ffff904abebcd2fd6572703d46c2a6032650 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -599,6 +599,20 @@ IF(BUILD_TESTING)
     --test-command  test1
     )
 
+IF (WIN32)
+  ADD_TEST(SubDir ${CMAKE_CTEST_COMMAND}
+    --build-and-test
+    "${CMake_SOURCE_DIR}/Tests/SubDir"
+    "${CMake_BINARY_DIR}/Tests/SubDir"
+    --build-exe-dir "${CMake_BINARY_DIR}/Tests/SubDir/Executable"
+    --build-generator ${CMAKE_GENERATOR}
+    --build-makeprogram ${MAKEPROGRAM}
+    --build-project SUBDIR
+    --test-command test 
+    "${CMake_BINARY_DIR}/Tests/SubDir/ShouldBeHere"
+    "${CMake_BINARY_DIR}/Tests/SubDir/testfromsubdir.obj"
+    )
+ELSE (WIN32)
   ADD_TEST(SubDir ${CMAKE_CTEST_COMMAND}
     --build-and-test
     "${CMake_SOURCE_DIR}/Tests/SubDir"
@@ -611,7 +625,8 @@ IF(BUILD_TESTING)
     "${CMake_BINARY_DIR}/Tests/SubDir/ShouldBeHere"
     "${CMake_BINARY_DIR}/Tests/SubDir/testfromsubdir.o"
     )
-    
+ENDIF (WIN32)    
+
   IF(${CMAKE_GENERATOR} MATCHES "Visual Studio")
     ADD_TEST(VSExternalInclude ${CMAKE_CTEST_COMMAND}
       --build-and-test