diff --git a/node.gyp b/node.gyp
index 3f71e154b98958..fb1c674e8e8c1a 100644
--- a/node.gyp
+++ b/node.gyp
@@ -1002,6 +1002,10 @@
         ['OS=="solaris"', {
           'ldflags': [ '-I<(SHARED_INTERMEDIATE_DIR)' ]
         }],
+        # Skip cctest while building shared lib node for Windows
+        [ 'OS=="win" and node_shared=="true"', {
+          'type': 'none',
+        }],
       ],
     }
   ], # end targets
diff --git a/vcbuild.bat b/vcbuild.bat
index e237cf9ee547b8..0c7bd0f48b2d95 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -529,6 +529,7 @@ if "%test_args%"=="" goto test-v8
 if "%config%"=="Debug" set test_args=--mode=debug %test_args%
 if "%config%"=="Release" set test_args=--mode=release %test_args%
 if defined no_cctest echo Skipping cctest because no-cctest was specified && goto run-test-py
+if not exist %config%\cctest.exe goto run-test-py
 echo running 'cctest %cctest_args%'
 "%config%\cctest" %cctest_args%
 :run-test-py