diff --git a/Lib/packaging/tests/test_util.py b/Lib/packaging/tests/test_util.py
index 29f53790fad..61b4ec76f36 100644
--- a/Lib/packaging/tests/test_util.py
+++ b/Lib/packaging/tests/test_util.py
@@ -526,11 +526,18 @@ def clean_tree(self, spec):
 
 class GlobTestCase(GlobTestCaseBase):
 
+    def setUp(self):
+        super(GlobTestCase, self).setUp()
+        self.cwd = os.getcwd()
+
+    def tearDown(self):
+        os.chdir(self.cwd)
+        super(GlobTestCase, self).tearDown()
+
     def assertGlobMatch(self, glob, spec):
         """"""
         tempdir = self.build_files_tree(spec)
         expected = self.clean_tree(spec)
-        self.addCleanup(os.chdir, os.getcwd())
         os.chdir(tempdir)
         result = list(iglob(glob))
         self.assertCountEqual(expected, result)