diff --git a/winbuild/build.py b/winbuild/build.py
index ad43f0b13..c25faaecf 100644
--- a/winbuild/build.py
+++ b/winbuild/build.py
@@ -12,6 +12,11 @@ def setup_vms():
         for arch in ('', 'x64'):
             ret.append("virtualenv -p c:/Python%s%s/python.exe --clear %s%s%s" %
                        (py, arch, VIRT_BASE, py, arch))
+            ret.append("%s%s%s\Scripts\pip.exe install nose" %
+                       (VIRT_BASE, py, arch))
+            if py == '26':
+                ret.append("%s%s%s\Scripts\pip.exe install unittest2" %
+                           (VIRT_BASE, py, arch))
     return "\n".join(ret)
 
 def run_script(params):
diff --git a/winbuild/test.py b/winbuild/test.py
index 22f80eefe..229b724cb 100644
--- a/winbuild/test.py
+++ b/winbuild/test.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-import subprocess, os, multiprocessing
+import subprocess, os, multiprocessing, glob
 
 from config import *
 
@@ -9,8 +9,11 @@ def test_one(params):
     try:
         print ("Running: %s, %s" %params)
         command = [r'%s\%s%s\Scripts\python.exe' % (VIRT_BASE, python, architecture),
-                   'Tests/run.py',
-                   '--installed']
+                   'test-installed.py',
+                   '--processes=-0',
+                   '--process-timeout=30',
+                   ]
+        command.extend(glob.glob('Tests/test*.py'))
         proc = subprocess.Popen(command, 
                                 stdin=subprocess.PIPE,
                                 stdout=subprocess.PIPE)