diff --git a/Lib/test/test_pkgutil.py b/Lib/test/test_pkgutil.py
index 3b743a8..f665e96 100644
--- a/Lib/test/test_pkgutil.py
+++ b/Lib/test/test_pkgutil.py
@@ -15,11 +15,11 @@
 
     def setUp(self):
         self.dirname = tempfile.mkdtemp()
+        self.addCleanup(shutil.rmtree, self.dirname)
         sys.path.insert(0, self.dirname)
 
     def tearDown(self):
         del sys.path[0]
-        shutil.rmtree(self.dirname)
 
     def test_getdata_filesys(self):
         pkg = 'test_getdata_filesys'
@@ -85,9 +85,9 @@
         # this does not appear to create an unreadable dir on Windows
         #   but the test should not fail anyway
         os.mkdir(d, 0)
+        self.addCleanup(os.rmdir, d)
         for t in pkgutil.walk_packages(path=[self.dirname]):
             self.fail("unexpected package found")
-        os.rmdir(d)
 
 class PkgutilPEP302Tests(unittest.TestCase):
 
diff --git a/Tools/iobench/iobench.py b/Tools/iobench/iobench.py
index 92b4ffa..6211e95 100644
--- a/Tools/iobench/iobench.py
+++ b/Tools/iobench/iobench.py
@@ -358,7 +358,7 @@
             with text_open(name, "r") as f:
                 return f.read()
         run_test_family(modify_tests, "b", text_files,
-            lambda fn: open(fn, "r+"), make_test_source)
+            lambda fn: text_open(fn, "r+"), make_test_source)
 
 
 def prepare_files():