diff --git a/runtests.py b/runtests.py
index 929bd0e933c..f30f6b6432a 100644
--- a/runtests.py
+++ b/runtests.py
@@ -212,6 +212,8 @@ def build_suite(self):
             if os.path.isdir(path):
                 if filename == 'pyregr' and not self.with_pyregr:
                     continue
+                if filename == 'broken' and not self.test_bugs:
+                    continue
                 suite.addTest(
                     self.handle_directory(path, filename))
         if sys.platform not in ['win32']: