diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
index 3a39ec9..05f34d8 100644
--- a/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@ -3,6 +3,8 @@
 import unittest
 import shutil
 import tempfile
+import os
+import os.path
 from test import test_support
 
 class TestShutil(unittest.TestCase):
@@ -12,11 +14,21 @@
         self.assertRaises(OSError, shutil.rmtree, filename)
         self.assertEqual(shutil.rmtree(filename, True), None)
 
+    def test_dont_move_dir_in_itself(self):
+        src_dir = tempfile.mkdtemp()
+        try:
+            dst = os.path.join(src_dir, 'foo')
+            self.assertRaises(shutil.Error, shutil.move, src_dir, dst)
+        finally:
+            try:
+                os.rmdir(src_dir)
+            except:
+                pass
 
-
+
+
 def test_main():
     test_support.run_unittest(TestShutil)
 
-
 if __name__ == '__main__':
     test_main()