--- a/tests/test-simplemerge.py	Sun Sep 29 12:25:29 2019 -0700
+++ b/tests/test-simplemerge.py	Sun Sep 29 12:34:52 2019 -0700
@@ -355,11 +355,5 @@
                          b'>>>>>>> THIS\r'.splitlines(True), list(m_lines))
 
 if __name__ == '__main__':
-    # hide the timer
-    import time
-    orig = time.time
-    try:
-        time.time = lambda: 0
-        unittest.main()
-    finally:
-        time.time = orig
+    import silenttestrunner
+    silenttestrunner.main(__name__)