diff --git a/contrib_tests/buzz/__init__.py b/contrib_tests/buzz/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/contrib_tests/buzz/__init__.py
diff --git a/contrib_tests/test_simple_buzz_wrapper.py b/contrib_tests/buzz/test_simple_buzz_wrapper.py
similarity index 100%
rename from contrib_tests/test_simple_buzz_wrapper.py
rename to contrib_tests/buzz/test_simple_buzz_wrapper.py
diff --git a/runtests.py b/runtests.py
index 776a171..30dc414 100644
--- a/runtests.py
+++ b/runtests.py
@@ -18,7 +18,10 @@
 
 def build_suite(folder, verbosity):
   # find all of the test modules
-  modules = map(fullmodname, glob.glob(os.path.join(folder, 'test_*.py')))
+  top_level_modules = map(fullmodname, glob.glob(os.path.join(folder, 'test_*.py')))
+  # TODO(ade) Verify that this works on Windows. If it doesn't then switch to os.walk instead
+  lower_level_modules = map(fullmodname, glob.glob(os.path.join(folder, '*/test_*.py')))
+  modules = top_level_modules + lower_level_modules
   if verbosity > 0:
     print "Running the tests found in the following modules:"
     print modules