diff --git a/src/dynamicScope.py b/src/dynamicScope.py
index f328cce8e..6013d0188 100644
--- a/src/dynamicScope.py
+++ b/src/dynamicScope.py
@@ -27,6 +27,8 @@
 # POSSIBILITY OF SUCH DAMAGE.
 ###
 
+import sys
+
 class DynamicScope(object):
     def _getLocals(self, name):
         f = sys._getframe().f_back.f_back # _getLocals <- __[gs]etattr__ <- ...
diff --git a/test/test_dynamicScope.py b/test/test_dynamicScope.py
new file mode 100644
index 000000000..f7fdb87d4
--- /dev/null
+++ b/test/test_dynamicScope.py
@@ -0,0 +1,58 @@
+###
+# Copyright (c) 2005, Jeremiah Fincher
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#   * Redistributions of source code must retain the above copyright notice,
+#     this list of conditions, and the following disclaimer.
+#   * Redistributions in binary form must reproduce the above copyright notice,
+#     this list of conditions, and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#   * Neither the name of the author of this software nor the name of
+#     contributors to this software may be used to endorse or promote products
+#     derived from this software without specific prior written consent.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+###
+
+from supybot.test import *
+
+class TestDynamic(SupyTestCase):
+    def test(self):
+        def f(x):
+            i = 2
+            return g(x)
+        def g(y):
+            j = 3
+            return h(y)
+        def h(z):
+            self.assertEqual(dynamic.z, z)
+            self.assertEqual(dynamic.j, 3)
+            self.assertEqual(dynamic.i, 2)
+            self.assertEqual(dynamic.y, z)
+            self.assertEqual(dynamic.x, z)
+            #self.assertRaises(NameError, getattr, dynamic, 'asdfqwerqewr')
+            self.assertEqual(dynamic.self, self)
+            return z
+        self.assertEqual(f(10), 10)
+
+    def testCommonUsage(self):
+        foo = 'bar'
+        def f():
+            foo = dynamic.foo
+            self.assertEqual(foo, 'bar')
+        f()
+
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: