diff --git a/Lib/distutils/tests/support.py b/Lib/distutils/tests/support.py
index 648a8e41563..a2190c0214f 100644
--- a/Lib/distutils/tests/support.py
+++ b/Lib/distutils/tests/support.py
@@ -63,9 +63,13 @@ class TempdirManager(object):
 
     def setUp(self):
         super(TempdirManager, self).setUp()
+        self.old_cwd = os.getcwd()
         self.tempdirs = []
 
     def tearDown(self):
+        # Restore working dir, for Solaris and derivatives, where rmdir()
+        # on the current directory fails.
+        os.chdir(self.old_cwd)
         super(TempdirManager, self).tearDown()
         while self.tempdirs:
             d = self.tempdirs.pop()