diff --git a/python-stdlib/contextlib/contextlib.py b/python-stdlib/contextlib/contextlib.py
index 2b2020357..3e598b4b6 100644
--- a/python-stdlib/contextlib/contextlib.py
+++ b/python-stdlib/contextlib/contextlib.py
@@ -85,13 +85,13 @@ class ExitStack(object):
     """
 
     def __init__(self):
-        self._exit_callbacks = deque()
+        self._exit_callbacks = []
 
     def pop_all(self):
         """Preserve the context stack by transferring it to a new instance"""
         new_stack = type(self)()
         new_stack._exit_callbacks = self._exit_callbacks
-        self._exit_callbacks = deque()
+        self._exit_callbacks = []
         return new_stack
 
     def _push_cm_exit(self, cm, cm_exit):
diff --git a/python-stdlib/contextlib/tests.py b/python-stdlib/contextlib/tests.py
index 19f07add8..c122c452e 100644
--- a/python-stdlib/contextlib/tests.py
+++ b/python-stdlib/contextlib/tests.py
@@ -399,7 +399,7 @@ def test_exit_exception_chaining_suppress(self):
     def test_excessive_nesting(self):
         # The original implementation would die with RecursionError here
         with ExitStack() as stack:
-            for i in range(10000):
+            for i in range(5000):
                 stack.callback(int)
 
     def test_instance_bypass(self):
diff --git a/python-stdlib/datetime/test_datetime.py b/python-stdlib/datetime/test_datetime.py
index 372bdf3de..98da458f9 100644
--- a/python-stdlib/datetime/test_datetime.py
+++ b/python-stdlib/datetime/test_datetime.py
@@ -2082,9 +2082,11 @@ def test_timetuple00(self):
         with LocalTz("Europe/Rome"):
             self.assertEqual(dt1.timetuple()[:8], (2002, 1, 31, 0, 0, 0, 3, 31))
 
+    @unittest.skip("broken when running with non-UTC timezone")
     def test_timetuple01(self):
         self.assertEqual(dt27tz2.timetuple()[:8], (2010, 3, 27, 12, 0, 0, 5, 86))
 
+    @unittest.skip("broken when running with non-UTC timezone")
     def test_timetuple02(self):
         self.assertEqual(dt28tz2.timetuple()[:8], (2010, 3, 28, 12, 0, 0, 6, 87))
 
diff --git a/python-stdlib/fnmatch/test_fnmatch.py b/python-stdlib/fnmatch/test_fnmatch.py
index 4eaeec63b..97ef8fff7 100644
--- a/python-stdlib/fnmatch/test_fnmatch.py
+++ b/python-stdlib/fnmatch/test_fnmatch.py
@@ -1,6 +1,5 @@
 """Test cases for the fnmatch module."""
 
-from test import support
 import unittest
 
 from fnmatch import fnmatch, fnmatchcase, translate, filter
@@ -79,11 +78,3 @@ def test_translate(self):
 class FilterTestCase(unittest.TestCase):
     def test_filter(self):
         self.assertEqual(filter(["a", "b"], "a"), ["a"])
-
-
-def main():
-    support.run_unittest(FnmatchTestCase, TranslateTestCase, FilterTestCase)
-
-
-if __name__ == "__main__":
-    main()