diff -r f48583bd21db Lib/test/test_shutil.py
--- a/Lib/test/test_shutil.py	Thu Apr 09 01:29:44 2009 -0700
+++ b/Lib/test/test_shutil.py	Thu Apr 09 01:34:24 2009 -0700
@@ -46,8 +46,11 @@
 
     def check_args_to_onerror(self, func, arg, exc):
         if self.errorState == 0:
-            self.assertEqual(func, os.remove)
-            self.assertEqual(arg, self.childpath)
+            if func == os.listdir:
+              self.assertEqual(arg, TESTFN)
+            else:
+              self.assertEqual(func, os.remove)
+              self.assertEqual(arg, self.childpath)
             self.failUnless(issubclass(exc[0], OSError))
             self.errorState = 1
         else: