diff --git a/Lib/unittest/suite.py b/Lib/unittest/suite.py
index a543e8191a5..b6ae68c31a5 100644
--- a/Lib/unittest/suite.py
+++ b/Lib/unittest/suite.py
@@ -109,7 +109,7 @@ def _wrapped_run(self, result, debug=False):
                     continue
 
             if hasattr(test, '_wrapped_run'):
-                test._wrapped_run(result)
+                test._wrapped_run(result, debug)
             elif not debug:
                 test(result)
             else:
diff --git a/Lib/unittest/test/test_setups.py b/Lib/unittest/test/test_setups.py
index 2ea45570172..eda3068f3a9 100644
--- a/Lib/unittest/test/test_setups.py
+++ b/Lib/unittest/test/test_setups.py
@@ -494,7 +494,9 @@ def test_something(self):
         Test.__module__ = 'Module'
         sys.modules['Module'] = Module
 
-        suite = unittest.defaultTestLoader.loadTestsFromTestCase(Test)
+        _suite = unittest.defaultTestLoader.loadTestsFromTestCase(Test)
+        suite = unittest.TestSuite()
+        suite.addTest(_suite)
 
         messages = ('setUpModule', 'tearDownModule', 'setUpClass', 'tearDownClass', 'test_something')
         for phase, msg in enumerate(messages):