rename from tests/test_rebuildmeta.py
rename to tests/comprehensive/test_rebuildmeta.py
--- a/tests/test_rebuildmeta.py
+++ b/tests/comprehensive/test_rebuildmeta.py
@@ -1,8 +1,15 @@
-import test_util
-
 import os
 import pickle
 import unittest
+import sys
+
+# wrapped in a try/except because of weirdness in how
+# run.py works as compared to nose.
+try:
+    import test_util
+except ImportError:
+    sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+    import test_util
 
 from mercurial import context
 from mercurial import extensions

rename from tests/test_updatemeta.py
rename to tests/comprehensive/test_updatemeta.py
--- a/tests/test_updatemeta.py
+++ b/tests/comprehensive/test_updatemeta.py
@@ -1,8 +1,15 @@
-import test_util
-
 import os
 import pickle
 import unittest
+
+# wrapped in a try/except because of weirdness in how
+# run.py works as compared to nose.
+try:
+    import test_util
+except ImportError:
+    sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+    import test_util
+
 import test_rebuildmeta
 
 from mercurial import context

--- a/tests/run.py
+++ b/tests/run.py
@@ -27,20 +27,20 @@ def tests():
     import test_push_dirs
     import test_push_eol
     import test_push_autoprops
-    import test_rebuildmeta
     import test_single_dir_clone
     import test_svnwrap
     import test_tags
     import test_template_keywords
     import test_utility_commands
     import test_unaffected_core
-    import test_updatemeta
     import test_urls
 
     sys.path.append(os.path.dirname(__file__))
     sys.path.append(os.path.join(os.path.dirname(__file__), 'comprehensive'))
 
+    import test_rebuildmeta
     import test_stupid_pull
+    import test_updatemeta
     import test_verify_and_startrev
 
     return locals()