diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index c83d7e1..529734a 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -22,7 +22,8 @@
 -h/--help       -- print this text and exit
 --timeout TIMEOUT
                 -- dump the traceback and exit if a test takes more
-                   than TIMEOUT seconds
+                   than TIMEOUT seconds; disabled if TIMEOUT is negative
+                   or equals to zero
 --wait          -- wait for user input, e.g., allow a debugger to be attached
 
 Verbosity
@@ -420,8 +421,7 @@
                 sys.exit(1)
             timeout = float(a)
             if timeout <= 0:
-                print("The timeout must be greater than 0", file=sys.stderr)
-                sys.exit(1)
+                timeout = None
         elif o == '--wait':
             input("Press any key to continue...")
         else: