diff --git a/node.gyp b/node.gyp
index 43ba985df54111..2967b5efc3def5 100644
--- a/node.gyp
+++ b/node.gyp
@@ -961,6 +961,10 @@
             'OTHER_LDFLAGS': [ '-Wl,-rpath,@loader_path', ],
           },
         }],
+        # 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 43962324857bed..7143d841a4e2bc 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -474,6 +474,7 @@ if errorlevel 1 goto exit
 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 not exist %config%\cctest.exe goto run-test-py
 echo running 'cctest %cctest_args%'
 "%config%\cctest" %cctest_args%
 REM when building a static library there's no binary to run tests