diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 7785f37ebcb..2a3f92a30ff 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -344,6 +344,10 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
             print   # Force a newline (just in case)
             print json.dumps(result)
             sys.exit(0)
+        else:
+            print >>sys.stderr, ("No handler for option {}.  Please "
+                "report this as a bug at http://bugs.python.org.").format(o)
+            sys.exit(1)
     if single and fromfile:
         usage(2, "-s and -f don't go together!")
     if use_mp and trace:
diff --git a/Misc/NEWS b/Misc/NEWS
index 4e2b131bfde..afa286de6ef 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1567,6 +1567,9 @@ Extension Modules
 Tests
 -----
 
+- Issue #7324: add a sanity check to regrtest argument parsing to
+  catch the case of an option with no handler.
+
 - Issue #7312: Add a -F flag to run the selected tests in a loop until
   a test fails.  Can be combined with -j.