diff --git a/README.md b/README.md
index 728b635d54..4c5a9b2781 100644
--- a/README.md
+++ b/README.md
@@ -1,21 +1,33 @@
 Evented I/O for V8 javascript.
 ===
 
-To build:
+### To build:
+
+Unix/Macintosh:
 
     ./configure
     make
     make install
 
-To run the tests:
+Windows:
+
+    vcbuild.bat
+
+### To run the tests:
+
+Unix/Macintosh:
 
     make test
 
-To build the documentation:
+Windows:
+
+    vcbuild.bat test
+
+### To build the documentation:
 
     make doc
 
-To read the documentation:
+### To read the documentation:
 
     man doc/node.1
 
diff --git a/generate-projects.bat b/generate-projects.bat
deleted file mode 100644
index fc9270da4f..0000000000
--- a/generate-projects.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-rem  --debug variables --debug includes --debug general
-python tools\gyp_node -f msvs -G msvs_version=2010
diff --git a/vcbuild.bat b/vcbuild.bat
index 2465626add..654421b23e 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -11,13 +11,13 @@ if /i "%1"=="-?" goto help
 if /i "%1"=="--?" goto help
 if /i "%1"=="/?" goto help
 
-@rem Bail out early if not running in VS build env.
-if not defined VCINSTALLDIR goto msbuild-not-found
-
 @rem Process arguments.
 set config=Debug
 set target=Build
 set noprojgen=
+set nobuild=
+set test=
+set test_args=
 
 :next-arg
 if "%1"=="" goto args-done
@@ -25,42 +25,69 @@ if /i "%1"=="debug"        set config=Debug&goto arg-ok
 if /i "%1"=="release"      set config=Release&goto arg-ok
 if /i "%1"=="clean"        set target=Clean&goto arg-ok
 if /i "%1"=="noprojgen"    set noprojgen=1&goto arg-ok
+if /i "%1"=="nobuild"      set nobuild=1&goto arg-ok
+if /i "%1"=="test-uv"      set test=test-uv&goto arg-ok
+if /i "%1"=="test-internet"set test=test-internet&goto arg-ok
+if /i "%1"=="test-pummel"  set test=test-pummel&goto arg-ok
+if /i "%1"=="test-simple"  set test=test-simple&goto arg-ok
+if /i "%1"=="test-message" set test=test-message&goto arg-ok
+if /i "%1"=="test-all"     set test=test-all&goto arg-ok
+if /i "%1"=="test"         set test=test&goto arg-ok
 :arg-ok
 shift
 goto next-arg
 :args-done
 
 
+:project-gen
 @rem Skip project generation if requested.
 if defined noprojgen goto msbuild
 
-:project-gen
 @rem Generate the VS project.
-call generate-projects.bat
+python tools\gyp_node -f msvs -G msvs_version=2010
 if errorlevel 1 goto create-msvs-files-failed
 if not exist node.sln goto create-msvs-files-failed
+echo Project files generated.
 
 :msbuild
+@rem Skip project generation if requested.
+if defined nobuild goto run
+
+if not defined VCINSTALLDIR echo Build skipped. To build, this file needs to run from VS cmd prompt.& goto run
+
 @rem Build the sln with msbuild.
 msbuild node.sln /t:%target% /p:Configuration=%config% /clp:NoSummary;NoItemAndPropertyList;Verbosity=minimal /nologo
 if errorlevel 1 goto exit
+
+:run
+@rem Run tests if requested.
+if "%test%"=="" goto exit
+
+if "%config%"=="Debug" set test_args=--mode=debug
+if "%config%"=="Release" set test_args=--mode=release
+
+if "%test%"=="test" set test_args=%test_args% simple message
+if "%test%"=="test-uv" set test_args=%test_args% --libuv simple
+if "%test%"=="test-internet" set test_args=%test_args% internet
+if "%test%"=="test-pummel" set test_args=%test_args% pummel
+if "%test%"=="test-simple" set test_args=%test_args% simple
+if "%test%"=="test-message" set test_args=%test_args% message
+if "%test%"=="test-all" set test_args=%test_args%
+
+echo running 'python tools/test.py %test_args%'
+python tools/test.py %test_args%
 goto exit
 
 :create-msvs-files-failed
 echo Failed to create vc project files. 
 goto exit
 
-:msbuild-not-found
-echo Failed to build.  In order to build the solution this file needs
-echo to run from VS command script.
-goto exit
-
 :help
-echo This script must run from VS command prompt.
-echo vcbuild.bat [debug/release] [clean] [noprojgen]
+echo vcbuild.bat [debug/release] [test-all/test-uv/test-internet/test-pummel/test-simple/test-message] [clean] [noprojgen] [nobuild]
 echo Examples:
-echo   vcbuild.bat              : builds debug build
-echo   vcbuild.bat release bench: builds release build
+echo   vcbuild.bat                : builds debug build
+echo   vcbuild.bat test           : builds debug build and runs tests
+echo   vcbuild.bat release test-uv: builds release build and runs --libuv tests
 goto exit
 
 :exit