diff --git a/NetSSL_Win/CMakeLists.txt b/NetSSL_Win/CMakeLists.txt
index 6935e1c8b..d00c8849e 100644
--- a/NetSSL_Win/CMakeLists.txt
+++ b/NetSSL_Win/CMakeLists.txt
@@ -31,11 +31,21 @@ POCO_INSTALL("${LIBNAME}")
 POCO_GENERATE_PACKAGE("${LIBNAME}")
 
 if (ENABLE_TESTS)
-    #TODO: 
+if (WIN32)
+#   FIXME: 
 #	add_subdirectory(testsuite)
+    message(STATUS "############ FIXME: add_subdirectory(testsuite)")
+else ()
+    add_subdirectory(testsuite)
+endif ()
 endif ()
 if (ENABLE_SAMPLES)
-    #TODO: Looks like the samples use crypto somehow?
-    #add_subdirectory(samples)
+if (WIN32)
+#   FIXME: Looks like the samples use crypto somehow?
+#   add_subdirectory(samples)
+message(STATUS "############ FIXME: add_subdirectory(samples)")
+else ()
+    add_subdirectory(testsuite)
+endif ()
 endif ()
 
diff --git a/appveyor.yml b/appveyor.yml
index 69fddd1f4..fc0eceb1b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -76,12 +76,12 @@ install:
   - c:\cygwin\bin\cat /proc/cpuinfo
   - c:\cygwin\bin\cat /proc/meminfo
   - ps: |
-        if (Test-Path "$env:ChocolateyInstall/bin/jom.exe") {
+        if (Test-Path "$env:ChocolateyInstall\bin\jom.exe") {
             echo "using jom from cache"
         } else {
             choco install jom
         }
-        if (Test-Path "$env:ChocolateyInstall/bin/cmake.exe") {
+        if (Test-Path "$env:ChocolateyInstall\bin\cmake.exe") {
             echo "using cmake from cache"
         } else {
             choco install cmake
@@ -195,7 +195,7 @@ build_script:
         } catch {
           Write-Warning "Oops: $_"
         }
-        $host.SetShouldExit(0);
+        cd ..
       }
 
 before_test: