diff --git a/tools/dispatcher b/tools/dispatcher
deleted file mode 100755
index 78da233d6..000000000
--- a/tools/dispatcher
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-pushd .. > /dev/null
-
-python "tools/driver-tests/${1}.py"
-exitval=$?
-
-echo "exit_code:$exitval" >> $2
-
-popd > /dev/null
diff --git a/tools/driver-tests/test1.py b/tools/driver-tests/test1.py
deleted file mode 100644
index a45c2d6eb..000000000
--- a/tools/driver-tests/test1.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from pymongo.connection import Connection
-
-db = Connection().test1
-db.drop_collection("part1")
-for i in range(100):
-    db.part1.save({"x":  i})
diff --git a/tools/driver_tests.py b/tools/driver_tests.py
new file mode 100755
index 000000000..c9e6583ec
--- /dev/null
+++ b/tools/driver_tests.py
@@ -0,0 +1,56 @@
+#!/usr/bin/env python
+
+# Copyright 2009 10gen, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Test runner for the driver tests."""
+
+import sys
+import os
+import datetime
+
+sys.path.append(os.path.join(os.getcwd(), ".."))
+from pymongo.connection import Connection
+
+def test1(db):
+    db.drop_collection("part1")
+    begin = datetime.datetime.now()
+    for i in range(100):
+        db.part1.save({"x": i})
+    return(begin, datetime.datetime.now())
+
+def main(test, out_file):
+    db = Connection()[test]
+    try:
+        (begin, end) = globals()[test](db)
+        exit_status = 0
+    except:
+        raise
+        begin = None
+        begin = None
+        exit_status = 1
+
+    f = open(out_file, "w")
+    try:
+        if begin and end:
+            f.write("begintime:%s\n" % begin)
+            f.write("endtime:%s\n" % end)
+            f.write("totaltime:%s\n" % (end - begin))
+        f.write("exit_code:%s\n" % exit_status)
+    finally:
+        f.close()
+
+if __name__ == "__main__":
+    main(sys.argv[1], sys.argv[2])
+