diff --git a/TESTGUIDE.md b/TESTGUIDE.md
index e91bd009389d8031bce8f5b31dafc4e3c32c6318..23cb45213ab1d23c138bdcf6acc02036b89ec39a 100644
--- a/TESTGUIDE.md
+++ b/TESTGUIDE.md
@@ -22,9 +22,8 @@ The test cases for this suite reside next to the Visual F# Tools code, at `vsint
 In order to run all of the tests, you will need to install
 
 * [Perl](http://www.perl.org/get.html) (ActiveState Perl 5.16.3 is known to work fine)
-* [NUnit](http://nunit.org/?p=download) (2.6.3 is known to work fine)
 
-Perl and NUnit must be included in the `%PATH%` for the below steps to work.  It is also recommended that you run tests from an elevated command prompt, as there are a couple of test cases which modify the GAC, and this requires administrative privileges.
+Perl must be included in the `%PATH%` for the below steps to work.  It is also recommended that you run tests from an elevated command prompt, as there are a couple of test cases which modify the GAC, and this requires administrative privileges.
 
 Before running tests, make sure you have successfully built all required projects as specified in the 'Prepare For Tests' section of the [DEVGUIDE](DEVGUIDE.md).
 
diff --git a/packages.config b/packages.config
index f3c92a29a42240362aaadf03e60afe400cde238d..a7462f8425056dfb0a38c467c6600c4ea15a4c10 100644
--- a/packages.config
+++ b/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="2.6.3" targetFramework="net40" />
-  <package id="NUnit.Runners" version="2.6.3" />
+  <package id="NUnit" version="2.6.4" targetFramework="net40" />
+  <package id="NUnit.Runners" version="2.6.4" />
 </packages>
\ No newline at end of file
diff --git a/src/FSharpSource.targets b/src/FSharpSource.targets
index 6d1f4382b7039badd3eaa01ba1897a3e93990283..84b6e0db5efe87874f5cd614ca926b64a0bc1f7a 100644
--- a/src/FSharpSource.targets
+++ b/src/FSharpSource.targets
@@ -95,6 +95,13 @@
 
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);OPEN_BUILD</DefineConstants>
+  </PropertyGroup>  
+  
+  <PropertyGroup>
+    <NUnitVersion>2.6.4</NUnitVersion>
+    <NUnitFullVersion>2.6.4.14350</NUnitFullVersion>
+    <NUnitLibDir>$(FSharpSourcesRoot)\..\packages\NUnit.$(NUnitVersion)\lib\</NUnitLibDir>
+    <NunitToolsLibDir>$(FSharpSourcesRoot)\..\packages\NUnit.Runners.$(NUnitVersion)\tools\lib\</NunitToolsLibDir>
   </PropertyGroup>
 
   <!-- v2.0-specific flags -->
diff --git a/tests/RunTests.cmd b/tests/RunTests.cmd
index ed947fa93666d7cc243e2e4c9930e9d7cfebbffc..75a70569bab7d52130b3adb5e3639d6a0eec03f8 100644
--- a/tests/RunTests.cmd
+++ b/tests/RunTests.cmd
@@ -8,6 +8,13 @@ goto :USAGE
 
 :flavor_ok
 
+set NUNITPATH=%~dp0%..\packages\NUnit.Runners.2.6.4\tools\
+if not exist "%NUNITPATH%" (
+    pushd %~dp0..
+    .\.nuget\nuget.exe restore packages.config -PackagesDirectory packages
+    popd
+)    
+
 rem "ttags" indicates what test areas will be run, based on the tags in the test.lst files
 set TTAGS_ARG=
 set _tmp=%3