diff --git a/run_tests.py b/run_tests.py
index aa88b2be..ccd10e60 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -38,6 +38,8 @@ parser.add_option("-c", "--compiler", dest="compiler_exe", help="Compiler binary
                   default=None)
 parser.add_option('-o', '--no-opt', dest='no_opt', help='Disable optimization',
                   default=False, action="store_true")
+parser.add_option('-j', '--jobs', dest='num_jobs', help='Maximum number of jobs to run in parallel',
+                  default="1024", type="int")
 parser.add_option('-v', '--verbose', dest='verbose', help='Enable verbose output',
                   default=False, action="store_true")
 parser.add_option('--wrap-exe', dest='wrapexe',
@@ -95,7 +97,7 @@ else:
     files = [ ]
     for f in argfiles:
         if os.path.splitext(string.lower(f))[1] != ".ispc":
-            print "Ignoring file %s, which doesn't have an .ispc extension." % f
+            sys.stdout.write("Ignoring file %s, which doesn't have an .ispc extension.\n" % f)
         else:
             files += [ f ]
 
@@ -268,8 +270,8 @@ def run_test(filename):
             if not run_error:
                 os.unlink(exe_name)
                 if is_windows:
-                    os.unlink(filename + ".pdb")
-                    os.unlink(filename + ".ilk")
+                    os.unlink("%s%s.pdb" % (input_prefix, filename))
+                    os.unlink("%s%s.ilk" % (input_prefix, filename))
             os.unlink(obj_name)
         except:
             None
@@ -326,12 +328,14 @@ if __name__ == '__main__':
     compile_error_files = [ ]
     run_error_files = [ ]
 
-    nthreads = multiprocessing.cpu_count()
-    print "Found %d CPUs. Running %d tests." % (nthreads, total_tests)
+    nthreads = min(multiprocessing.cpu_count(), options.num_jobs)
+    sys.stdout.write("Running %d jobs in parallel. Running %d tests.\n" % (nthreads, total_tests))
 
     # put each of the test filenames into a queue
     q = multiprocessing.Queue()
     for fn in files:
+        if is_windows:
+            fn = fn.replace("\\",'/')
         q.put(fn)
     for x in range(nthreads):
         q.put('STOP')
@@ -351,7 +355,7 @@ if __name__ == '__main__':
     # (i.e. return 0 if all is ok)
     for t in task_threads:
         t.join()
-    print
+    sys.stdout.write("\n")
 
     while not qret.empty():
         (c, r) = qret.get()
diff --git a/winstuff/stdint.h b/winstuff/stdint.h
index 5878843d..7f3f8100 100644
--- a/winstuff/stdint.h
+++ b/winstuff/stdint.h
@@ -1,9 +1,14 @@
 #ifndef MY_STDINT_H
 #define MY_STDINT_H 1
 
+typedef signed char int8_t;
+typedef signed __int16 int16_t;
+typedef signed __int32 int32_t;
+typedef signed __int64 int64_t;
+typedef unsigned char uint8_t;
+
+typedef unsigned __int16 uint16_t;
 typedef unsigned __int32 uint32_t;
-typedef __int32 int32_t;
-typedef __int64 int64_t;
 typedef unsigned __int64 uint64_t;
 
 #endif // MY_STDINT_H