diff --git a/docs/CMake.html b/docs/CMake.html
index fc729af1740..e303d132b59 100644
--- a/docs/CMake.html
+++ b/docs/CMake.html
@@ -339,6 +339,12 @@
     on Visual C++ and Xcode,
     <tt>&quot;-sv&quot;</tt> on others.</dd>
 
+  <dt><b>LLVM_LIT_TOOLS_DIR</b>:STRING</dt>
+  <dd>The path to GnuWin32 tools for tests. Valid on Windows host.
+    Defaults to "", then Lit seeks tools according to %PATH%.
+    Lit can find tools(eg. grep, sort, &c) on LLVM_LIT_TOOLS_DIR at first,
+    without specifying GnuWin32 to %PATH%.</dd>
+
   <dt><b>LLVM_ENABLE_FFI</b>:BOOL</dt>
   <dd>Indicates whether LLVM Interpreter will be linked with Foreign
     Function Interface library. If the library or its headers are
@@ -364,7 +370,7 @@
   <p><tt>make check</tt></p>
 </div>
 
-<p>Testing is not supported on Visual Studio.</p>
+<p>On Visual Studio, you may run tests to build the project "check".</p>
 
 </div>
 
diff --git a/docs/GettingStartedVS.html b/docs/GettingStartedVS.html
index 96b7bfe928b..7417f4aaa9b 100644
--- a/docs/GettingStartedVS.html
+++ b/docs/GettingStartedVS.html
@@ -112,7 +112,8 @@
 
   <p>If you would like to run the LLVM tests you will need
   <a href="http://www.python.org/">Python</a>. Versions 2.4-2.7 are known to
-  work.</p>
+  work. You will need <a href="http://gnuwin32.sourceforge.net/">"GnuWin32"</a>
+  tools, too.</p>
 
   <p>Do not install the LLVM directory tree into a path containing spaces (e.g.
   C:\Documents and Settings\...) as the configure step will fail.</p>
@@ -191,6 +192,15 @@
     program will print the corresponding fibonacci value.</li>
   </ul></li>
 
+  <li>Test LLVM on Visual Studio:
+  <ul>
+    <li>If %PATH% does not contain GnuWin32, you may specify LLVM_LIT_TOOLS_DIR
+    on CMake for the path to GnuWin32.</li>
+    <li>You can run LLVM tests to build the project "check".</li>
+  </ul>
+  </li>
+
+  <!-- FIXME: Is it up-to-date? -->
   <li>Test LLVM:
   <ul>
     <li>The LLVM tests can be run by <tt>cd</tt>ing to the llvm source directory