diff --git a/test/run_all b/test/run_all
index e27e3c571..f695ec757 100755
--- a/test/run_all
+++ b/test/run_all
@@ -70,7 +70,11 @@ class TestRunner(object):
         self._outputq = Queue()
 
     def _find_tests(self):
+<<<<<<< HEAD
         for test in glob.glob("*.t"):
+=======
+        for test in glob.glob("*.t") + glob.glob("*.t.py"):
+>>>>>>> e73f4b821 (update paths and globing in run_all)
             if os.access(test, os.X_OK):
                 # Executables only
                 if self._is_parallelizable(test):