diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 6d7fe8ec9b0..40d7c3e7d3d 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -373,6 +373,14 @@ class WalkTests(unittest.TestCase):
 
 class MakedirTests (unittest.TestCase):
     def setUp(self):
+        try:
+            os.rmdir(test_support.TESTFN)
+        except OSError:
+            pass
+        try:
+            os.unlink(test_support.TESTFN)
+        except OSError:
+            pass
         os.mkdir(test_support.TESTFN)
 
     def test_makedir(self):