Index: test/CMakeLists.txt
===================================================================
--- test/CMakeLists.txt
+++ test/CMakeLists.txt
@@ -27,7 +27,7 @@
 
 set(LLDB_COMMON_TEST_ARGS
   --executable
-  ${CMAKE_BINARY_DIR}/bin/lldb
+  ${CMAKE_BINARY_DIR}/bin/lldb${CMAKE_EXECUTABLE_SUFFIX}
   -s
   ${LLDB_TRACE_DIR}
   -u CXXFLAGS
Index: test/dosep.ty
===================================================================
--- test/dosep.ty
+++ test/dosep.ty
@@ -11,7 +11,7 @@
 from optparse import OptionParser
 
 # Command template of the invocation of the test driver.
-template = '%s/dotest.py %s -p %s %s'
+template = '%s %s/dotest.py %s -p %s %s'
 
 def process_dir(root, files, test_root, dotest_options):
     """Examine a directory for tests, and invoke any found within it."""
@@ -28,7 +28,10 @@
         if os.path.islink(path):
             continue
 
-        command = template % (test_root, dotest_options if dotest_options else "", name, root)
+        if sys.platform.startswith('win'):
+            root = root.replace('\\', '/')
+        command = template % (sys.executable, test_root, dotest_options if dotest_options else "", name, root)
+        print 'RUNNING:', command
         if 0 != os.system(command):
             failed.append(name)
         else:
@@ -96,7 +99,7 @@
                       type='int',
                       dest='num_threads',
                       help="""The number of threads to use when running tests separately.""",
-                      default=multiprocessing.cpu_count())
+                      default=1)#multiprocessing.cpu_count())
 
     opts, args = parser.parse_args()
     dotest_options = opts.dotest_options