@@ -79,6 +79,9 @@ def test_cp17420():
     lines = temp_file.readlines()
     temp_file.close()
     AreEqual(len(lines), 100)
+
+    os.unlink(test_file_name)
+    os.unlink(test_log_name)
     
 #------------------------------------------------------------------------------
 def test_cp17274():
@@ -864,8 +867,8 @@ class SomeOtherError(SomeError, IOError):
 
 def test_gh1357():
     import os
-    filename = os.path.join(test.tempdir, 'gh1357.py')
-    dll = os.path.join(test.tempdir, "test.dll")
+    filename = os.path.join(testpath.temporary_dir, 'gh1357.py')
+    dll = os.path.join(testpath.temporary_dir, "test.dll")
     with open(filename, 'w') as f:
         f.write('{(1,): None}')
 