181 files changed, 67 insertions, 67 deletions
diff --git a/MANIFEST.in b/MANIFEST.in
index 0150d90e..d2712d98 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -11,6 +11,6 @@ include requirements.txt
 include igor.py
 include tox.ini
 
-recursive-include test *
+recursive-include tests *
 recursive-include doc *.rst
 global-exclude *.pyc
diff --git a/Makefile b/Makefile
index eb920945..666d38a5 100644
--- a/Makefile
+++ b/Makefile
@@ -3,13 +3,13 @@
 default:
 	@echo "* No default action *"
 
-TEST_ZIP = test/zipmods.zip
-TEST_EGG = test/eggsrc/dist/covtestegg1-0.0.0-py*.egg
+TEST_ZIP = tests/zipmods.zip
+TEST_EGG = tests/eggsrc/dist/covtestegg1-0.0.0-py*.egg
 
 clean:
 	-rm -f *.pyd */*.pyd
 	-rm -f *.so */*.so
-	PYTHONPATH=. python test/test_farm.py clean
+	PYTHONPATH=. python tests/test_farm.py clean
 	-rm -rf build coverage.egg-info dist htmlcov
 	-rm -f *.pyc */*.pyc */*/*.pyc */*/*/*.pyc */*/*/*/*.pyc */*/*/*/*/*.pyc
 	-rm -f *.pyo */*.pyo */*/*.pyo */*/*/*.pyo */*/*/*/*.pyo */*/*/*/*/*.pyo
@@ -20,14 +20,14 @@ clean:
 	-rm -f MANIFEST
 	-rm -f .coverage .coverage.* coverage.xml
 	-rm -f $(TEST_ZIP)
-	-rm -rf test/eggsrc/build test/eggsrc/dist test/eggsrc/*.egg-info
+	-rm -rf tests/eggsrc/build tests/eggsrc/dist tests/eggsrc/*.egg-info
 	-rm -f setuptools-*.egg distribute-*.egg distribute-*.tar.gz
 	-rm -rf doc/_build
 
 sterile: clean
 	-rm -rf .tox*
 
-LINTABLE = coverage igor.py setup.py test
+LINTABLE = coverage igor.py setup.py tests
 
 lint:
 	-pylint --rcfile=.pylintrc $(LINTABLE)
@@ -37,7 +37,7 @@ lint:
 pep8:
 	pep8 --filename=*.py --ignore=E401,E301 --repeat coverage
 
-tests:
+test:
 	tox -e py27 $(ARGS)
 
 metacov:
diff --git a/doc/contributing.rst b/doc/contributing.rst
index 90b9ba1b..6c422b55 100644
--- a/doc/contributing.rst
+++ b/doc/contributing.rst
@@ -113,9 +113,9 @@ To limit tox to just a few versions of Python, use the ``-e`` switch::
 
 To run just a few tests, you can use nose test selector syntax::
 
-    $ tox test.test_misc:SetupPyTest.test_metadata
+    $ tox tests.test_misc:SetupPyTest.test_metadata
 
-This looks in `test/test_misc.py` to find the `SetupPyTest` class, and runs the
+This looks in `tests/test_misc.py` to find the `SetupPyTest` class, and runs the
 `test_metadata` test method.
 
 Of course, run all the tests on every version of Python you have, before
@@ -129,8 +129,8 @@ I try to keep the coverage.py as clean as possible.  I use pylint to alert me
 to possible problems::
 
     $ make lint
-    pylint --rcfile=.pylintrc coverage setup.py test
-    python -m tabnanny coverage setup.py test
+    pylint --rcfile=.pylintrc coverage setup.py tests
+    python -m tabnanny coverage setup.py tests
     python igor.py check_eol
 
 The source is pylint-clean, even if it's because there are pragmas quieting
diff --git a/howto.txt b/howto.txt
index 632467b3..fc1904c2 100644
--- a/howto.txt
+++ b/howto.txt
@@ -91,4 +91,4 @@
 
 - To run the Javascript tests:
 
-    open test/js/index.html in variety of browsers.
+    open tests/js/index.html in variety of browsers.
diff --git a/igor.py b/igor.py
index b54ba5da..e093d494 100644
--- a/igor.py
+++ b/igor.py
@@ -122,8 +122,8 @@ def do_test_with_tracer(tracer, *noseargs):
 
 def do_zip_mods():
     """Build the zipmods.zip file."""
-    zf = zipfile.ZipFile("test/zipmods.zip", "w")
-    zf.write("test/covmodzip1.py", "covmodzip1.py")
+    zf = zipfile.ZipFile("tests/zipmods.zip", "w")
+    zf.write("tests/covmodzip1.py", "covmodzip1.py")
     zf.close()
 
 def do_install_egg():
@@ -132,7 +132,7 @@ def do_install_egg():
     # pylint: disable=F0401,E0611,E1101
     import distutils.core
     cur_dir = os.getcwd()
-    os.chdir("test/eggsrc")
+    os.chdir("tests/eggsrc")
     distutils.core.run_setup("setup.py", ["--quiet", "bdist_egg"])
     egg = glob.glob("dist/*.egg")[0]
     distutils.core.run_setup(
@@ -188,10 +188,10 @@ def do_check_eol():
 
     check_files("coverage", ["*.py", "*.c"])
     check_files("coverage/htmlfiles", ["*.html", "*.css", "*.js"])
-    check_file("test/farm/html/src/bom.py", crlf=False)
-    check_files("test", ["*.py"])
-    check_files("test", ["*,cover"], trail_white=False)
-    check_files("test/js", ["*.js", "*.html"])
+    check_file("tests/farm/html/src/bom.py", crlf=False)
+    check_files("tests", ["*.py"])
+    check_files("tests", ["*,cover"], trail_white=False)
+    check_files("tests/js", ["*.js", "*.html"])
     check_file("setup.py")
     check_file("igor.py")
     check_file("Makefile")
diff --git a/metacov.ini b/metacov.ini
index 384a6b03..75bd9d2d 100644
--- a/metacov.ini
+++ b/metacov.ini
@@ -5,7 +5,7 @@ data_file = $COVERAGE_HOME/.coverage.meta
 parallel = true
 source =
     $COVERAGE_HOME/coverage
-    $COVERAGE_HOME/test
+    $COVERAGE_HOME/tests
     $COVERAGE_HOME/.tox/py25/lib/python2.5/site-packages/coverage
     $COVERAGE_HOME/.tox/py26/lib/python2.6/site-packages/coverage
     $COVERAGE_HOME/.tox/py27/lib/python2.7/site-packages/coverage
diff --git a/test/__init__.py b/tests/__init__.py
index 5a0e30f4..5a0e30f4 100644
--- a/test/__init__.py
+++ b/tests/__init__.py
diff --git a/test/backtest.py b/tests/backtest.py
index b17aa242..b17aa242 100644
--- a/test/backtest.py
+++ b/tests/backtest.py
diff --git a/test/backunittest.py b/tests/backunittest.py
index 30da78eb..30da78eb 100644
--- a/test/backunittest.py
+++ b/tests/backunittest.py
diff --git a/test/coveragetest.py b/tests/coveragetest.py
index 6f6217aa..5613fa69 100644
--- a/test/coveragetest.py
+++ b/tests/coveragetest.py
@@ -6,8 +6,8 @@ import coverage
 from coverage.backward import sorted, StringIO      # pylint: disable=W0622
 from coverage.backward import to_bytes
 from coverage.control import _TEST_NAME_FILE
-from test.backtest import run_command
-from test.backunittest import TestCase
+from tests.backtest import run_command
+from tests.backunittest import TestCase
 
 class Tee(object):
     """A file-like that writes to all the file-likes it has."""
@@ -452,8 +452,8 @@ class CoverageTest(TestCase):
         # Add our test modules directory to PYTHONPATH.  I'm sure there's too
         # much path munging here, but...
         here = os.path.dirname(self.nice_file(coverage.__file__, ".."))
-        testmods = self.nice_file(here, 'test/modules')
-        zipfile = self.nice_file(here, 'test/zipmods.zip')
+        testmods = self.nice_file(here, 'tests/modules')
+        zipfile = self.nice_file(here, 'tests/zipmods.zip')
         pypath = os.getenv('PYTHONPATH', '')
         if pypath:
             pypath += os.pathsep
diff --git a/test/covmodzip1.py b/tests/covmodzip1.py
index 3ec4cdc4..3ec4cdc4 100644
--- a/test/covmodzip1.py
+++ b/tests/covmodzip1.py
diff --git a/test/eggsrc/egg1/__init__.py b/tests/eggsrc/egg1/__init__.py
index e69de29b..e69de29b 100644
--- a/test/eggsrc/egg1/__init__.py
+++ b/tests/eggsrc/egg1/__init__.py
diff --git a/test/eggsrc/egg1/egg1.py b/tests/eggsrc/egg1/egg1.py
index 3fadde33..3fadde33 100644
--- a/test/eggsrc/egg1/egg1.py
+++ b/tests/eggsrc/egg1/egg1.py
diff --git a/test/eggsrc/setup.py b/tests/eggsrc/setup.py
index f9b8b9d0..f9b8b9d0 100644
--- a/test/eggsrc/setup.py
+++ b/tests/eggsrc/setup.py
diff --git a/test/farm/annotate/annotate_dir.py b/tests/farm/annotate/annotate_dir.py
index 3e37f9ed..3e37f9ed 100644
--- a/test/farm/annotate/annotate_dir.py
+++ b/tests/farm/annotate/annotate_dir.py
diff --git a/test/farm/annotate/gold/white.py,cover b/tests/farm/annotate/gold/white.py,cover
index 36b0b993..36b0b993 100644
--- a/test/farm/annotate/gold/white.py,cover
+++ b/tests/farm/annotate/gold/white.py,cover
diff --git a/test/farm/annotate/gold_anno_dir/a___init__.py,cover b/tests/farm/annotate/gold_anno_dir/a___init__.py,cover
index e69de29b..e69de29b 100644
--- a/test/farm/annotate/gold_anno_dir/a___init__.py,cover
+++ b/tests/farm/annotate/gold_anno_dir/a___init__.py,cover
diff --git a/test/farm/annotate/gold_anno_dir/a_a.py,cover b/tests/farm/annotate/gold_anno_dir/a_a.py,cover
index d0ff3c0c..d0ff3c0c 100644
--- a/test/farm/annotate/gold_anno_dir/a_a.py,cover
+++ b/tests/farm/annotate/gold_anno_dir/a_a.py,cover
diff --git a/test/farm/annotate/gold_anno_dir/b___init__.py,cover b/tests/farm/annotate/gold_anno_dir/b___init__.py,cover
index e69de29b..e69de29b 100644
--- a/test/farm/annotate/gold_anno_dir/b___init__.py,cover
+++ b/tests/farm/annotate/gold_anno_dir/b___init__.py,cover
diff --git a/test/farm/annotate/gold_anno_dir/b_b.py,cover b/tests/farm/annotate/gold_anno_dir/b_b.py,cover
index 90d076f1..90d076f1 100644
--- a/test/farm/annotate/gold_anno_dir/b_b.py,cover
+++ b/tests/farm/annotate/gold_anno_dir/b_b.py,cover
diff --git a/test/farm/annotate/gold_anno_dir/multi.py,cover b/tests/farm/annotate/gold_anno_dir/multi.py,cover
index 2a5c59ce..2a5c59ce 100644
--- a/test/farm/annotate/gold_anno_dir/multi.py,cover
+++ b/tests/farm/annotate/gold_anno_dir/multi.py,cover
diff --git a/test/farm/annotate/gold_multi/a/__init__.py,cover b/tests/farm/annotate/gold_multi/a/__init__.py,cover
index e69de29b..e69de29b 100644
--- a/test/farm/annotate/gold_multi/a/__init__.py,cover
+++ b/tests/farm/annotate/gold_multi/a/__init__.py,cover
diff --git a/test/farm/annotate/gold_multi/a/a.py,cover b/tests/farm/annotate/gold_multi/a/a.py,cover
index fb3f5435..fb3f5435 100644
--- a/test/farm/annotate/gold_multi/a/a.py,cover
+++ b/tests/farm/annotate/gold_multi/a/a.py,cover
diff --git a/test/farm/annotate/gold_multi/b/__init__.py,cover b/tests/farm/annotate/gold_multi/b/__init__.py,cover
index e69de29b..e69de29b 100644
--- a/test/farm/annotate/gold_multi/b/__init__.py,cover
+++ b/tests/farm/annotate/gold_multi/b/__init__.py,cover
diff --git a/test/farm/annotate/gold_multi/b/b.py,cover b/tests/farm/annotate/gold_multi/b/b.py,cover
index a3f5daec..a3f5daec 100644
--- a/test/farm/annotate/gold_multi/b/b.py,cover
+++ b/tests/farm/annotate/gold_multi/b/b.py,cover
diff --git a/test/farm/annotate/gold_multi/multi.py,cover b/tests/farm/annotate/gold_multi/multi.py,cover
index 2a5c59ce..2a5c59ce 100644
--- a/test/farm/annotate/gold_multi/multi.py,cover
+++ b/tests/farm/annotate/gold_multi/multi.py,cover
diff --git a/test/farm/annotate/gold_v24/white.py,cover b/tests/farm/annotate/gold_v24/white.py,cover
index bbd8d428..bbd8d428 100644
--- a/test/farm/annotate/gold_v24/white.py,cover
+++ b/tests/farm/annotate/gold_v24/white.py,cover
diff --git a/test/farm/annotate/run.py b/tests/farm/annotate/run.py
index c645f21c..c645f21c 100644
--- a/test/farm/annotate/run.py
+++ b/tests/farm/annotate/run.py
diff --git a/test/farm/annotate/run_multi.py b/tests/farm/annotate/run_multi.py
index 4e8252ed..4e8252ed 100644
--- a/test/farm/annotate/run_multi.py
+++ b/tests/farm/annotate/run_multi.py
diff --git a/test/farm/annotate/src/a/__init__.py b/tests/farm/annotate/src/a/__init__.py
index e69de29b..e69de29b 100644
--- a/test/farm/annotate/src/a/__init__.py
+++ b/tests/farm/annotate/src/a/__init__.py
diff --git a/test/farm/annotate/src/a/a.py b/tests/farm/annotate/src/a/a.py
index c2583d1e..c2583d1e 100644
--- a/test/farm/annotate/src/a/a.py
+++ b/tests/farm/annotate/src/a/a.py
diff --git a/test/farm/annotate/src/b/__init__.py b/tests/farm/annotate/src/b/__init__.py
index e69de29b..e69de29b 100644
--- a/test/farm/annotate/src/b/__init__.py
+++ b/tests/farm/annotate/src/b/__init__.py
diff --git a/test/farm/annotate/src/b/b.py b/tests/farm/annotate/src/b/b.py
index 625a5490..625a5490 100644
--- a/test/farm/annotate/src/b/b.py
+++ b/tests/farm/annotate/src/b/b.py
diff --git a/test/farm/annotate/src/multi.py b/tests/farm/annotate/src/multi.py
index 19a6200c..19a6200c 100644
--- a/test/farm/annotate/src/multi.py
+++ b/tests/farm/annotate/src/multi.py
diff --git a/test/farm/annotate/src/white.py b/tests/farm/annotate/src/white.py
index ecbbd25a..ecbbd25a 100644
--- a/test/farm/annotate/src/white.py
+++ b/tests/farm/annotate/src/white.py
diff --git a/test/farm/html/gold_a/a.html b/tests/farm/html/gold_a/a.html
index c794525e..c794525e 100644
--- a/test/farm/html/gold_a/a.html
+++ b/tests/farm/html/gold_a/a.html
diff --git a/test/farm/html/gold_a/index.html b/tests/farm/html/gold_a/index.html
index a821e9df..a821e9df 100644
--- a/test/farm/html/gold_a/index.html
+++ b/tests/farm/html/gold_a/index.html
diff --git a/test/farm/html/gold_b_branch/b.html b/tests/farm/html/gold_b_branch/b.html
index 0258ad13..0258ad13 100644
--- a/test/farm/html/gold_b_branch/b.html
+++ b/tests/farm/html/gold_b_branch/b.html
diff --git a/test/farm/html/gold_b_branch/index.html b/tests/farm/html/gold_b_branch/index.html
index cb6ffa17..cb6ffa17 100644
--- a/test/farm/html/gold_b_branch/index.html
+++ b/tests/farm/html/gold_b_branch/index.html
diff --git a/test/farm/html/gold_bom/bom.html b/tests/farm/html/gold_bom/bom.html
index 1d61a62c..1d61a62c 100644
--- a/test/farm/html/gold_bom/bom.html
+++ b/tests/farm/html/gold_bom/bom.html
diff --git a/test/farm/html/gold_bom/index.html b/tests/farm/html/gold_bom/index.html
index 8653b23e..8653b23e 100644
--- a/test/farm/html/gold_bom/index.html
+++ b/tests/farm/html/gold_bom/index.html
diff --git a/test/farm/html/gold_isolatin1/index.html b/tests/farm/html/gold_isolatin1/index.html
index 6e9f3ca7..6e9f3ca7 100644
--- a/test/farm/html/gold_isolatin1/index.html
+++ b/tests/farm/html/gold_isolatin1/index.html
diff --git a/test/farm/html/gold_isolatin1/isolatin1.html b/tests/farm/html/gold_isolatin1/isolatin1.html
index 276a6c25..276a6c25 100644
--- a/test/farm/html/gold_isolatin1/isolatin1.html
+++ b/tests/farm/html/gold_isolatin1/isolatin1.html
diff --git a/test/farm/html/gold_omit_1/index.html b/tests/farm/html/gold_omit_1/index.html
index 5616d012..5616d012 100644
--- a/test/farm/html/gold_omit_1/index.html
+++ b/tests/farm/html/gold_omit_1/index.html
diff --git a/test/farm/html/gold_omit_1/m1.html b/tests/farm/html/gold_omit_1/m1.html
index 62ba1e0a..62ba1e0a 100644
--- a/test/farm/html/gold_omit_1/m1.html
+++ b/tests/farm/html/gold_omit_1/m1.html
diff --git a/test/farm/html/gold_omit_1/m2.html b/tests/farm/html/gold_omit_1/m2.html
index d75a5ba0..d75a5ba0 100644
--- a/test/farm/html/gold_omit_1/m2.html
+++ b/tests/farm/html/gold_omit_1/m2.html
diff --git a/test/farm/html/gold_omit_1/m3.html b/tests/farm/html/gold_omit_1/m3.html
index bd99138a..bd99138a 100644
--- a/test/farm/html/gold_omit_1/m3.html
+++ b/tests/farm/html/gold_omit_1/m3.html
diff --git a/test/farm/html/gold_omit_1/main.html b/tests/farm/html/gold_omit_1/main.html
index 03948718..03948718 100644
--- a/test/farm/html/gold_omit_1/main.html
+++ b/tests/farm/html/gold_omit_1/main.html
diff --git a/test/farm/html/gold_omit_2/index.html b/tests/farm/html/gold_omit_2/index.html
index 3ce5bade..3ce5bade 100644
--- a/test/farm/html/gold_omit_2/index.html
+++ b/tests/farm/html/gold_omit_2/index.html
diff --git a/test/farm/html/gold_omit_2/m2.html b/tests/farm/html/gold_omit_2/m2.html
index d75a5ba0..d75a5ba0 100644
--- a/test/farm/html/gold_omit_2/m2.html
+++ b/tests/farm/html/gold_omit_2/m2.html
diff --git a/test/farm/html/gold_omit_2/m3.html b/tests/farm/html/gold_omit_2/m3.html
index bd99138a..bd99138a 100644
--- a/test/farm/html/gold_omit_2/m3.html
+++ b/tests/farm/html/gold_omit_2/m3.html
diff --git a/test/farm/html/gold_omit_2/main.html b/tests/farm/html/gold_omit_2/main.html
index 03948718..03948718 100644
--- a/test/farm/html/gold_omit_2/main.html
+++ b/tests/farm/html/gold_omit_2/main.html
diff --git a/test/farm/html/gold_omit_3/index.html b/tests/farm/html/gold_omit_3/index.html
index fb826bf5..fb826bf5 100644
--- a/test/farm/html/gold_omit_3/index.html
+++ b/tests/farm/html/gold_omit_3/index.html
diff --git a/test/farm/html/gold_omit_3/m3.html b/tests/farm/html/gold_omit_3/m3.html
index bd99138a..bd99138a 100644
--- a/test/farm/html/gold_omit_3/m3.html
+++ b/tests/farm/html/gold_omit_3/m3.html
diff --git a/test/farm/html/gold_omit_3/main.html b/tests/farm/html/gold_omit_3/main.html
index 03948718..03948718 100644
--- a/test/farm/html/gold_omit_3/main.html
+++ b/tests/farm/html/gold_omit_3/main.html
diff --git a/test/farm/html/gold_omit_4/index.html b/tests/farm/html/gold_omit_4/index.html
index e437cf10..e437cf10 100644
--- a/test/farm/html/gold_omit_4/index.html
+++ b/tests/farm/html/gold_omit_4/index.html
diff --git a/test/farm/html/gold_omit_4/m1.html b/tests/farm/html/gold_omit_4/m1.html
index 62ba1e0a..62ba1e0a 100644
--- a/test/farm/html/gold_omit_4/m1.html
+++ b/tests/farm/html/gold_omit_4/m1.html
diff --git a/test/farm/html/gold_omit_4/m3.html b/tests/farm/html/gold_omit_4/m3.html
index bd99138a..bd99138a 100644
--- a/test/farm/html/gold_omit_4/m3.html
+++ b/tests/farm/html/gold_omit_4/m3.html
diff --git a/test/farm/html/gold_omit_4/main.html b/tests/farm/html/gold_omit_4/main.html
index 03948718..03948718 100644
--- a/test/farm/html/gold_omit_4/main.html
+++ b/tests/farm/html/gold_omit_4/main.html
diff --git a/test/farm/html/gold_omit_5/index.html b/tests/farm/html/gold_omit_5/index.html
index 4bde6b73..4bde6b73 100644
--- a/test/farm/html/gold_omit_5/index.html
+++ b/tests/farm/html/gold_omit_5/index.html
diff --git a/test/farm/html/gold_omit_5/m1.html b/tests/farm/html/gold_omit_5/m1.html
index 62ba1e0a..62ba1e0a 100644
--- a/test/farm/html/gold_omit_5/m1.html
+++ b/tests/farm/html/gold_omit_5/m1.html
diff --git a/test/farm/html/gold_omit_5/main.html b/tests/farm/html/gold_omit_5/main.html
index 03948718..03948718 100644
--- a/test/farm/html/gold_omit_5/main.html
+++ b/tests/farm/html/gold_omit_5/main.html
diff --git a/test/farm/html/gold_other/blah_blah_other.html b/tests/farm/html/gold_other/blah_blah_other.html
index ab5ae371..a8255d87 100644
--- a/test/farm/html/gold_other/blah_blah_other.html
+++ b/tests/farm/html/gold_other/blah_blah_other.html
@@ -5,7 +5,7 @@
     
     
     <meta http-equiv='X-UA-Compatible' content='IE=emulateIE7' />
-    <title>Coverage for /home/ned/coverage/trunk/test/farm/html/othersrc/other: 100%</title>
+    <title>Coverage for /home/ned/coverage/trunk/tests/farm/html/othersrc/other: 100%</title>
     <link rel='stylesheet' href='style.css' type='text/css'>
     <script type='text/javascript' src='jquery-1.4.3.min.js'></script>
     <script type='text/javascript' src='jquery.hotkeys.js'></script>
@@ -19,7 +19,7 @@
 
 <div id='header'>
     <div class='content'>
-        <h1>Coverage for <b>/home/ned/coverage/trunk/test/farm/html/othersrc/other</b> :
+        <h1>Coverage for <b>/home/ned/coverage/trunk/tests/farm/html/othersrc/other</b> :
             <span class='pc_cov'>100%</span>
         </h1>
         <img id='keyboard_icon' src='keybd_closed.png'>
diff --git a/test/farm/html/gold_other/here.html b/tests/farm/html/gold_other/here.html
index 1da5bcd6..1da5bcd6 100644
--- a/test/farm/html/gold_other/here.html
+++ b/tests/farm/html/gold_other/here.html
diff --git a/test/farm/html/gold_other/index.html b/tests/farm/html/gold_other/index.html
index 7665cfe4..8b47458e 100644
--- a/test/farm/html/gold_other/index.html
+++ b/tests/farm/html/gold_other/index.html
@@ -65,7 +65,7 @@
         <tbody>
             
             <tr class='file'>
-                <td class='name left'><a href='_home_ned_coverage_trunk_test_farm_html_othersrc_other.html'>/home/ned/coverage/trunk/test/farm/html/othersrc/other</a></td>
+                <td class='name left'><a href='_home_ned_coverage_trunk_tests_farm_html_othersrc_other.html'>/home/ned/coverage/trunk/tests/farm/html/othersrc/other</a></td>
                 <td>1</td>
                 <td>0</td>
                 <td>0</td>
diff --git a/test/farm/html/gold_partial/index.html b/tests/farm/html/gold_partial/index.html
index 5556150a..5556150a 100644
--- a/test/farm/html/gold_partial/index.html
+++ b/tests/farm/html/gold_partial/index.html
diff --git a/test/farm/html/gold_partial/partial.html b/tests/farm/html/gold_partial/partial.html
index b9640ce4..b9640ce4 100644
--- a/test/farm/html/gold_partial/partial.html
+++ b/tests/farm/html/gold_partial/partial.html
diff --git a/test/farm/html/gold_styled/a.html b/tests/farm/html/gold_styled/a.html
index c794525e..c794525e 100644
--- a/test/farm/html/gold_styled/a.html
+++ b/tests/farm/html/gold_styled/a.html
diff --git a/test/farm/html/gold_styled/extra.css b/tests/farm/html/gold_styled/extra.css
index 46c41fcd..46c41fcd 100644
--- a/test/farm/html/gold_styled/extra.css
+++ b/tests/farm/html/gold_styled/extra.css
diff --git a/test/farm/html/gold_styled/index.html b/tests/farm/html/gold_styled/index.html
index a821e9df..a821e9df 100644
--- a/test/farm/html/gold_styled/index.html
+++ b/tests/farm/html/gold_styled/index.html
diff --git a/test/farm/html/gold_styled/style.css b/tests/farm/html/gold_styled/style.css
index c40357b8..c40357b8 100644
--- a/test/farm/html/gold_styled/style.css
+++ b/tests/farm/html/gold_styled/style.css
diff --git a/test/farm/html/gold_unicode/index.html b/tests/farm/html/gold_unicode/index.html
index 9ba1bb39..9ba1bb39 100644
--- a/test/farm/html/gold_unicode/index.html
+++ b/tests/farm/html/gold_unicode/index.html
diff --git a/test/farm/html/gold_unicode/unicode.html b/tests/farm/html/gold_unicode/unicode.html
index 518a59a1..518a59a1 100644
--- a/test/farm/html/gold_unicode/unicode.html
+++ b/tests/farm/html/gold_unicode/unicode.html
diff --git a/test/farm/html/gold_x_xml/coverage.xml b/tests/farm/html/gold_x_xml/coverage.xml
index 912112f2..912112f2 100644
--- a/test/farm/html/gold_x_xml/coverage.xml
+++ b/tests/farm/html/gold_x_xml/coverage.xml
diff --git a/test/farm/html/gold_y_xml_branch/coverage.xml b/tests/farm/html/gold_y_xml_branch/coverage.xml
index ecbe0073..ecbe0073 100644
--- a/test/farm/html/gold_y_xml_branch/coverage.xml
+++ b/tests/farm/html/gold_y_xml_branch/coverage.xml
diff --git a/test/farm/html/othersrc/other.py b/tests/farm/html/othersrc/other.py
index 6d3f86e7..6d3f86e7 100644
--- a/test/farm/html/othersrc/other.py
+++ b/tests/farm/html/othersrc/other.py
diff --git a/test/farm/html/run_a.py b/tests/farm/html/run_a.py
index 59cc1703..59cc1703 100644
--- a/test/farm/html/run_a.py
+++ b/tests/farm/html/run_a.py
diff --git a/test/farm/html/run_a_xml_1.py b/tests/farm/html/run_a_xml_1.py
index 3d187023..3d187023 100644
--- a/test/farm/html/run_a_xml_1.py
+++ b/tests/farm/html/run_a_xml_1.py
diff --git a/test/farm/html/run_a_xml_2.py b/tests/farm/html/run_a_xml_2.py
index 53691ead..53691ead 100644
--- a/test/farm/html/run_a_xml_2.py
+++ b/tests/farm/html/run_a_xml_2.py
diff --git a/test/farm/html/run_b_branch.py b/tests/farm/html/run_b_branch.py
index d0955a2a..d0955a2a 100644
--- a/test/farm/html/run_b_branch.py
+++ b/tests/farm/html/run_b_branch.py
diff --git a/test/farm/html/run_bom.py b/tests/farm/html/run_bom.py
index c35079be..c35079be 100644
--- a/test/farm/html/run_bom.py
+++ b/tests/farm/html/run_bom.py
diff --git a/test/farm/html/run_isolatin1.py b/tests/farm/html/run_isolatin1.py
index 063e6e00..063e6e00 100644
--- a/test/farm/html/run_isolatin1.py
+++ b/tests/farm/html/run_isolatin1.py
diff --git a/test/farm/html/run_omit_1.py b/tests/farm/html/run_omit_1.py
index a5556af2..a5556af2 100644
--- a/test/farm/html/run_omit_1.py
+++ b/tests/farm/html/run_omit_1.py
diff --git a/test/farm/html/run_omit_2.py b/tests/farm/html/run_omit_2.py
index 19f0ebdc..19f0ebdc 100644
--- a/test/farm/html/run_omit_2.py
+++ b/tests/farm/html/run_omit_2.py
diff --git a/test/farm/html/run_omit_3.py b/tests/farm/html/run_omit_3.py
index 87ab8c32..87ab8c32 100644
--- a/test/farm/html/run_omit_3.py
+++ b/tests/farm/html/run_omit_3.py
diff --git a/test/farm/html/run_omit_4.py b/tests/farm/html/run_omit_4.py
index ede223f8..ede223f8 100644
--- a/test/farm/html/run_omit_4.py
+++ b/tests/farm/html/run_omit_4.py
diff --git a/test/farm/html/run_omit_5.py b/tests/farm/html/run_omit_5.py
index 8da51994..8da51994 100644
--- a/test/farm/html/run_omit_5.py
+++ b/tests/farm/html/run_omit_5.py
diff --git a/test/farm/html/run_other.py b/tests/farm/html/run_other.py
index 72bb3ec1..72bb3ec1 100644
--- a/test/farm/html/run_other.py
+++ b/tests/farm/html/run_other.py
diff --git a/test/farm/html/run_partial.py b/tests/farm/html/run_partial.py
index 41e6ba96..41e6ba96 100644
--- a/test/farm/html/run_partial.py
+++ b/tests/farm/html/run_partial.py
diff --git a/test/farm/html/run_styled.py b/tests/farm/html/run_styled.py
index ac538ff5..ac538ff5 100644
--- a/test/farm/html/run_styled.py
+++ b/tests/farm/html/run_styled.py
diff --git a/test/farm/html/run_tabbed.py b/tests/farm/html/run_tabbed.py
index 0e9b5278..0e9b5278 100644
--- a/test/farm/html/run_tabbed.py
+++ b/tests/farm/html/run_tabbed.py
diff --git a/test/farm/html/run_unicode.py b/tests/farm/html/run_unicode.py
index cef26ee5..cef26ee5 100644
--- a/test/farm/html/run_unicode.py
+++ b/tests/farm/html/run_unicode.py
diff --git a/test/farm/html/run_y_xml_branch.py b/tests/farm/html/run_y_xml_branch.py
index 88a2e44e..88a2e44e 100644
--- a/test/farm/html/run_y_xml_branch.py
+++ b/tests/farm/html/run_y_xml_branch.py
diff --git a/test/farm/html/src/a.py b/tests/farm/html/src/a.py
index 9e71aebd..9e71aebd 100644
--- a/test/farm/html/src/a.py
+++ b/tests/farm/html/src/a.py
diff --git a/test/farm/html/src/b.py b/tests/farm/html/src/b.py
index 3bf73a9f..3bf73a9f 100644
--- a/test/farm/html/src/b.py
+++ b/tests/farm/html/src/b.py
diff --git a/test/farm/html/src/bom.py b/tests/farm/html/src/bom.py
index 2db8b717..2db8b717 100644
--- a/test/farm/html/src/bom.py
+++ b/tests/farm/html/src/bom.py
diff --git a/test/farm/html/src/coverage.xml b/tests/farm/html/src/coverage.xml
index 128cf750..128cf750 100644
--- a/test/farm/html/src/coverage.xml
+++ b/tests/farm/html/src/coverage.xml
diff --git a/test/farm/html/src/extra.css b/tests/farm/html/src/extra.css
index 46c41fcd..46c41fcd 100644
--- a/test/farm/html/src/extra.css
+++ b/tests/farm/html/src/extra.css
diff --git a/test/farm/html/src/here.py b/tests/farm/html/src/here.py
index d0d26ea7..d0d26ea7 100644
--- a/test/farm/html/src/here.py
+++ b/tests/farm/html/src/here.py
diff --git a/test/farm/html/src/isolatin1.py b/tests/farm/html/src/isolatin1.py
index 057c097b..057c097b 100644
--- a/test/farm/html/src/isolatin1.py
+++ b/tests/farm/html/src/isolatin1.py
diff --git a/test/farm/html/src/m1.py b/tests/farm/html/src/m1.py
index 927e1f6b..927e1f6b 100644
--- a/test/farm/html/src/m1.py
+++ b/tests/farm/html/src/m1.py
diff --git a/test/farm/html/src/m2.py b/tests/farm/html/src/m2.py
index ffddf6cf..ffddf6cf 100644
--- a/test/farm/html/src/m2.py
+++ b/tests/farm/html/src/m2.py
diff --git a/test/farm/html/src/m3.py b/tests/farm/html/src/m3.py
index 395d7d25..395d7d25 100644
--- a/test/farm/html/src/m3.py
+++ b/tests/farm/html/src/m3.py
diff --git a/test/farm/html/src/main.py b/tests/farm/html/src/main.py
index ce894465..ce894465 100644
--- a/test/farm/html/src/main.py
+++ b/tests/farm/html/src/main.py
diff --git a/test/farm/html/src/omit4.ini b/tests/farm/html/src/omit4.ini
index 6821ecda..6821ecda 100644
--- a/test/farm/html/src/omit4.ini
+++ b/tests/farm/html/src/omit4.ini
diff --git a/test/farm/html/src/omit5.ini b/tests/farm/html/src/omit5.ini
index 7e32b414..7e32b414 100644
--- a/test/farm/html/src/omit5.ini
+++ b/tests/farm/html/src/omit5.ini
diff --git a/test/farm/html/src/partial.py b/tests/farm/html/src/partial.py
index 8d62f5c5..8d62f5c5 100644
--- a/test/farm/html/src/partial.py
+++ b/tests/farm/html/src/partial.py
diff --git a/test/farm/html/src/run_a_xml_2.ini b/tests/farm/html/src/run_a_xml_2.ini
index 8d28f97b..8d28f97b 100644
--- a/test/farm/html/src/run_a_xml_2.ini
+++ b/tests/farm/html/src/run_a_xml_2.ini
diff --git a/test/farm/html/src/tabbed.py b/tests/farm/html/src/tabbed.py
index 2035852f..2035852f 100644
--- a/test/farm/html/src/tabbed.py
+++ b/tests/farm/html/src/tabbed.py
diff --git a/test/farm/html/src/unicode.py b/tests/farm/html/src/unicode.py
index f6a9a052..f6a9a052 100644
--- a/test/farm/html/src/unicode.py
+++ b/tests/farm/html/src/unicode.py
diff --git a/test/farm/html/src/y.py b/tests/farm/html/src/y.py
index af7c9689..af7c9689 100644
--- a/test/farm/html/src/y.py
+++ b/tests/farm/html/src/y.py
diff --git a/test/farm/run/run_chdir.py b/tests/farm/run/run_chdir.py
index f459f500..f459f500 100644
--- a/test/farm/run/run_chdir.py
+++ b/tests/farm/run/run_chdir.py
diff --git a/test/farm/run/run_timid.py b/tests/farm/run/run_timid.py
index ce78fff1..ce78fff1 100644
--- a/test/farm/run/run_timid.py
+++ b/tests/farm/run/run_timid.py
diff --git a/test/farm/run/run_xxx.py b/tests/farm/run/run_xxx.py
index 19e94a42..19e94a42 100644
--- a/test/farm/run/run_xxx.py
+++ b/tests/farm/run/run_xxx.py
diff --git a/test/farm/run/src/chdir.py b/tests/farm/run/src/chdir.py
index 6d834924..6d834924 100644
--- a/test/farm/run/src/chdir.py
+++ b/tests/farm/run/src/chdir.py
diff --git a/test/farm/run/src/showtrace.py b/tests/farm/run/src/showtrace.py
index e97412e0..e97412e0 100644
--- a/test/farm/run/src/showtrace.py
+++ b/tests/farm/run/src/showtrace.py
diff --git a/test/farm/run/src/subdir/placeholder b/tests/farm/run/src/subdir/placeholder
index e69de29b..e69de29b 100644
--- a/test/farm/run/src/subdir/placeholder
+++ b/tests/farm/run/src/subdir/placeholder
diff --git a/test/farm/run/src/xxx b/tests/farm/run/src/xxx
index 8f727f08..8f727f08 100644
--- a/test/farm/run/src/xxx
+++ b/tests/farm/run/src/xxx
diff --git a/test/js/index.html b/tests/js/index.html
index 60bdb30a..60bdb30a 100644
--- a/test/js/index.html
+++ b/tests/js/index.html
diff --git a/test/js/tests.js b/tests/js/tests.js
index 73b4ce2b..73b4ce2b 100644
--- a/test/js/tests.js
+++ b/tests/js/tests.js
diff --git a/test/modules/aa/__init__.py b/tests/modules/aa/__init__.py
index 77593d8f..77593d8f 100644
--- a/test/modules/aa/__init__.py
+++ b/tests/modules/aa/__init__.py
diff --git a/test/modules/aa/afile.odd.py b/tests/modules/aa/afile.odd.py
index c6f49e18..c6f49e18 100644
--- a/test/modules/aa/afile.odd.py
+++ b/tests/modules/aa/afile.odd.py
diff --git a/test/modules/aa/afile.py b/tests/modules/aa/afile.py
index 3f0e38d1..3f0e38d1 100644
--- a/test/modules/aa/afile.py
+++ b/tests/modules/aa/afile.py
diff --git a/test/modules/aa/bb.odd/bfile.py b/tests/modules/aa/bb.odd/bfile.py
index 90875404..90875404 100644
--- a/test/modules/aa/bb.odd/bfile.py
+++ b/tests/modules/aa/bb.odd/bfile.py
diff --git a/test/modules/aa/bb/__init__.py b/tests/modules/aa/bb/__init__.py
index ffbe6240..ffbe6240 100644
--- a/test/modules/aa/bb/__init__.py
+++ b/tests/modules/aa/bb/__init__.py
diff --git a/test/modules/aa/bb/bfile.odd.py b/tests/modules/aa/bb/bfile.odd.py
index b45cba8c..b45cba8c 100644
--- a/test/modules/aa/bb/bfile.odd.py
+++ b/tests/modules/aa/bb/bfile.odd.py
diff --git a/test/modules/aa/bb/bfile.py b/tests/modules/aa/bb/bfile.py
index 90875404..90875404 100644
--- a/test/modules/aa/bb/bfile.py
+++ b/tests/modules/aa/bb/bfile.py
diff --git a/test/modules/aa/bb/cc/__init__.py b/tests/modules/aa/bb/cc/__init__.py
index e69de29b..e69de29b 100644
--- a/test/modules/aa/bb/cc/__init__.py
+++ b/tests/modules/aa/bb/cc/__init__.py
diff --git a/test/modules/aa/bb/cc/cfile.py b/tests/modules/aa/bb/cc/cfile.py
index 79764751..79764751 100644
--- a/test/modules/aa/bb/cc/cfile.py
+++ b/tests/modules/aa/bb/cc/cfile.py
diff --git a/test/modules/aa/zfile.py b/tests/modules/aa/zfile.py
index 924f9b77..924f9b77 100644
--- a/test/modules/aa/zfile.py
+++ b/tests/modules/aa/zfile.py
diff --git a/test/modules/covmod1.py b/tests/modules/covmod1.py
index b3f5e5f2..b3f5e5f2 100644
--- a/test/modules/covmod1.py
+++ b/tests/modules/covmod1.py
diff --git a/test/modules/pkg1/__init__.py b/tests/modules/pkg1/__init__.py
index 2dfeb9c1..2dfeb9c1 100644
--- a/test/modules/pkg1/__init__.py
+++ b/tests/modules/pkg1/__init__.py
diff --git a/test/modules/pkg1/__main__.py b/tests/modules/pkg1/__main__.py
index 66ce5956..66ce5956 100644
--- a/test/modules/pkg1/__main__.py
+++ b/tests/modules/pkg1/__main__.py
diff --git a/test/modules/pkg1/p1a.py b/tests/modules/pkg1/p1a.py
index be5fcdd3..be5fcdd3 100644
--- a/test/modules/pkg1/p1a.py
+++ b/tests/modules/pkg1/p1a.py
diff --git a/test/modules/pkg1/p1b.py b/tests/modules/pkg1/p1b.py
index 59d6fb54..59d6fb54 100644
--- a/test/modules/pkg1/p1b.py
+++ b/tests/modules/pkg1/p1b.py
diff --git a/test/modules/pkg1/p1c.py b/tests/modules/pkg1/p1c.py
index a9aeef04..a9aeef04 100644
--- a/test/modules/pkg1/p1c.py
+++ b/tests/modules/pkg1/p1c.py
diff --git a/test/modules/pkg1/runmod2.py b/tests/modules/pkg1/runmod2.py
index b52964cb..b52964cb 100644
--- a/test/modules/pkg1/runmod2.py
+++ b/tests/modules/pkg1/runmod2.py
diff --git a/test/modules/pkg1/sub/__init__.py b/tests/modules/pkg1/sub/__init__.py
index e69de29b..e69de29b 100644
--- a/test/modules/pkg1/sub/__init__.py
+++ b/tests/modules/pkg1/sub/__init__.py
diff --git a/test/modules/pkg1/sub/__main__.py b/tests/modules/pkg1/sub/__main__.py
index b5be9f1c..b5be9f1c 100644
--- a/test/modules/pkg1/sub/__main__.py
+++ b/tests/modules/pkg1/sub/__main__.py
diff --git a/test/modules/pkg1/sub/ps1a.py b/tests/modules/pkg1/sub/ps1a.py
index 4b6a15cc..4b6a15cc 100644
--- a/test/modules/pkg1/sub/ps1a.py
+++ b/tests/modules/pkg1/sub/ps1a.py
diff --git a/test/modules/pkg1/sub/runmod3.py b/tests/modules/pkg1/sub/runmod3.py
index 3a1ad155..3a1ad155 100644
--- a/test/modules/pkg1/sub/runmod3.py
+++ b/tests/modules/pkg1/sub/runmod3.py
diff --git a/test/modules/pkg2/__init__.py b/tests/modules/pkg2/__init__.py
index 090efbf5..090efbf5 100644
--- a/test/modules/pkg2/__init__.py
+++ b/tests/modules/pkg2/__init__.py
diff --git a/test/modules/pkg2/p2a.py b/tests/modules/pkg2/p2a.py
index b606711d..b606711d 100644
--- a/test/modules/pkg2/p2a.py
+++ b/tests/modules/pkg2/p2a.py
diff --git a/test/modules/pkg2/p2b.py b/tests/modules/pkg2/p2b.py
index 7a34e2c6..7a34e2c6 100644
--- a/test/modules/pkg2/p2b.py
+++ b/tests/modules/pkg2/p2b.py
diff --git a/test/modules/runmod1.py b/tests/modules/runmod1.py
index 671d81ef..671d81ef 100644
--- a/test/modules/runmod1.py
+++ b/tests/modules/runmod1.py
diff --git a/test/modules/usepkgs.py b/tests/modules/usepkgs.py
index 93c7d904..93c7d904 100644
--- a/test/modules/usepkgs.py
+++ b/tests/modules/usepkgs.py
diff --git a/test/moremodules/othermods/__init__.py b/tests/moremodules/othermods/__init__.py
index e69de29b..e69de29b 100644
--- a/test/moremodules/othermods/__init__.py
+++ b/tests/moremodules/othermods/__init__.py
diff --git a/test/moremodules/othermods/othera.py b/tests/moremodules/othermods/othera.py
index 78896928..78896928 100644
--- a/test/moremodules/othermods/othera.py
+++ b/tests/moremodules/othermods/othera.py
diff --git a/test/moremodules/othermods/otherb.py b/tests/moremodules/othermods/otherb.py
index 2bd8a441..2bd8a441 100644
--- a/test/moremodules/othermods/otherb.py
+++ b/tests/moremodules/othermods/otherb.py
diff --git a/test/moremodules/othermods/sub/__init__.py b/tests/moremodules/othermods/sub/__init__.py
index e69de29b..e69de29b 100644
--- a/test/moremodules/othermods/sub/__init__.py
+++ b/tests/moremodules/othermods/sub/__init__.py
diff --git a/test/moremodules/othermods/sub/osa.py b/tests/moremodules/othermods/sub/osa.py
index 0139d28b..0139d28b 100644
--- a/test/moremodules/othermods/sub/osa.py
+++ b/tests/moremodules/othermods/sub/osa.py
diff --git a/test/moremodules/othermods/sub/osb.py b/tests/moremodules/othermods/sub/osb.py
index b024b148..b024b148 100644
--- a/test/moremodules/othermods/sub/osb.py
+++ b/tests/moremodules/othermods/sub/osb.py
diff --git a/test/osinfo.py b/tests/osinfo.py
index 25c3a7c6..25c3a7c6 100644
--- a/test/osinfo.py
+++ b/tests/osinfo.py
diff --git a/test/qunit/jquery.tmpl.min.js b/tests/qunit/jquery.tmpl.min.js
index 7438b2ca..7438b2ca 100644
--- a/test/qunit/jquery.tmpl.min.js
+++ b/tests/qunit/jquery.tmpl.min.js
diff --git a/test/qunit/qunit.css b/tests/qunit/qunit.css
index b3c6db52..b3c6db52 100644
--- a/test/qunit/qunit.css
+++ b/tests/qunit/qunit.css
diff --git a/test/qunit/qunit.js b/tests/qunit/qunit.js
index e00cca90..e00cca90 100644
--- a/test/qunit/qunit.js
+++ b/tests/qunit/qunit.js
diff --git a/test/stress_phystoken.tok b/tests/stress_phystoken.tok
index 8d1b6bec..8d1b6bec 100644
--- a/test/stress_phystoken.tok
+++ b/tests/stress_phystoken.tok
diff --git a/test/stress_phystoken_dos.tok b/tests/stress_phystoken_dos.tok
index b08fd70e..b08fd70e 100644
--- a/test/stress_phystoken_dos.tok
+++ b/tests/stress_phystoken_dos.tok
diff --git a/test/test_api.py b/tests/test_api.py
index 559684b8..300a2374 100644
--- a/test/test_api.py
+++ b/tests/test_api.py
@@ -5,7 +5,7 @@ import fnmatch, os, re, sys, textwrap
 import coverage
 from coverage.backward import StringIO
 
-from test.coveragetest import CoverageTest
+from tests.coveragetest import CoverageTest
 
 
 class SingletonApiTest(CoverageTest):
diff --git a/test/test_arcs.py b/tests/test_arcs.py
index ec0225f1..1eb1786e 100644
--- a/test/test_arcs.py
+++ b/tests/test_arcs.py
@@ -1,7 +1,7 @@
 """Tests for Coverage.py's arc measurement."""
 
 import sys
-from test.coveragetest import CoverageTest
+from tests.coveragetest import CoverageTest
 
 
 class SimpleArcTest(CoverageTest):
diff --git a/test/test_cmdline.py b/tests/test_cmdline.py
index 33f90212..6b11b3e9 100644
--- a/test/test_cmdline.py
+++ b/tests/test_cmdline.py
@@ -6,7 +6,7 @@ import coverage
 import coverage.cmdline
 from coverage.misc import ExceptionDuringRun
 
-from test.coveragetest import CoverageTest, OK, ERR
+from tests.coveragetest import CoverageTest, OK, ERR
 
 
 class CmdLineTest(CoverageTest):
diff --git a/test/test_codeunit.py b/tests/test_codeunit.py
index b4caff88..e4912e11 100644
--- a/test/test_codeunit.py
+++ b/tests/test_codeunit.py
@@ -5,7 +5,7 @@ import os, sys
 from coverage.codeunit import code_unit_factory
 from coverage.files import FileLocator
 
-from test.coveragetest import CoverageTest
+from tests.coveragetest import CoverageTest
 
 # pylint: disable=F0401
 # Unable to import 'aa' (No module named aa)
diff --git a/test/test_config.py b/tests/test_config.py
index 1ca63765..6d370255 100644
--- a/test/test_config.py
+++ b/tests/test_config.py
@@ -5,7 +5,7 @@ import sys
 import coverage
 from coverage.misc import CoverageException
 
-from test.coveragetest import CoverageTest
+from tests.coveragetest import CoverageTest
 
 
 class ConfigTest(CoverageTest):
diff --git a/test/test_coverage.py b/tests/test_coverage.py
index 0918dfe1..9b421fc7 100644
--- a/test/test_coverage.py
+++ b/tests/test_coverage.py
@@ -4,7 +4,7 @@
 import sys
 import coverage
 from coverage.misc import CoverageException
-from test.coveragetest import CoverageTest
+from tests.coveragetest import CoverageTest
 
 
 class TestCoverageTest(CoverageTest):
diff --git a/test/test_data.py b/tests/test_data.py
index 9281ccc7..98156a86 100644
--- a/test/test_data.py
+++ b/tests/test_data.py
@@ -4,7 +4,7 @@ from coverage.backward import pickle
 from coverage.data import CoverageData
 from coverage.files import PathAliases
 
-from test.coveragetest import CoverageTest
+from tests.coveragetest import CoverageTest
 
 
 DATA_1 = { 'a.py': {1:None, 2:None}, 'b.py': {3:None} }
diff --git a/test/test_execfile.py b/tests/test_execfile.py
index e7d7041f..7da2854d 100644
--- a/test/test_execfile.py
+++ b/tests/test_execfile.py
@@ -5,7 +5,7 @@ import os, sys
 from coverage.execfile import run_python_file, run_python_module
 from coverage.misc import NoSource
 
-from test.coveragetest import CoverageTest
+from tests.coveragetest import CoverageTest
 
 here = os.path.dirname(__file__)
 
diff --git a/test/test_farm.py b/tests/test_farm.py
index f25d6109..e514e663 100644
--- a/test/test_farm.py
+++ b/tests/test_farm.py
@@ -3,14 +3,14 @@
 import difflib, filecmp, fnmatch, glob, os, re, shutil, sys
 from nose.plugins.skip import SkipTest
 
-from test.backtest import run_command, execfile      # pylint: disable=W0622
+from tests.backtest import run_command, execfile      # pylint: disable=W0622
 
 from coverage.control import _TEST_NAME_FILE
 
 
 def test_farm(clean_only=False):
     """A test-generating function for nose to find and run."""
-    for fname in glob.glob("test/farm/*/*.py"):
+    for fname in glob.glob("tests/farm/*/*.py"):
         case = FarmTestCase(fname, clean_only)
         yield (case,)
 
diff --git a/test/test_files.py b/tests/test_files.py
index 051b2743..509c23b1 100644
--- a/test/test_files.py
+++ b/tests/test_files.py
@@ -7,7 +7,7 @@ from coverage.files import PathAliases, find_python_files, abs_file
 from coverage.backward import set                   # pylint: disable=W0622
 from coverage.misc import CoverageException
 
-from test.coveragetest import CoverageTest
+from tests.coveragetest import CoverageTest
 
 
 class FileLocatorTest(CoverageTest):
diff --git a/test/test_html.py b/tests/test_html.py
index 66d1bd7d..40852acc 100644
--- a/test/test_html.py
+++ b/tests/test_html.py
@@ -5,7 +5,7 @@ import os.path, re, sys
 import coverage
 from coverage.misc import NotPython, NoSource
 
-from test.coveragetest import CoverageTest
+from tests.coveragetest import CoverageTest
 
 class HtmlTestHelpers(CoverageTest):
     """Methods that help with HTML tests."""
diff --git a/test/test_misc.py b/tests/test_misc.py
index a32030ca..ef4a8774 100644
--- a/test/test_misc.py
+++ b/tests/test_misc.py
@@ -2,7 +2,7 @@
 
 from coverage.misc import Hasher, file_be_gone
 from coverage import __version__, __url__
-from test.coveragetest import CoverageTest
+from tests.coveragetest import CoverageTest
 
 class HasherTest(CoverageTest):
     """Test our wrapper of md5 hashing."""
diff --git a/test/test_oddball.py b/tests/test_oddball.py
index 113328bb..60fab48f 100644
--- a/test/test_oddball.py
+++ b/tests/test_oddball.py
@@ -3,8 +3,8 @@
 import os, sys
 import coverage
 
-from test.coveragetest import CoverageTest
-from test import osinfo
+from tests.coveragetest import CoverageTest
+from tests import osinfo
 
 class ThreadingTest(CoverageTest):
     """Tests of the threading support."""
diff --git a/test/test_parser.py b/tests/test_parser.py
index 6ccef206..80773c74 100644
--- a/test/test_parser.py
+++ b/tests/test_parser.py
@@ -1,7 +1,7 @@
 """Tests for Coverage.py's code parsing."""
 
 import textwrap
-from test.coveragetest import CoverageTest
+from tests.coveragetest import CoverageTest
 from coverage.parser import CodeParser
 
 
diff --git a/test/test_phystokens.py b/tests/test_phystokens.py
index e4834e4c..6d38a0e5 100644
--- a/test/test_phystokens.py
+++ b/tests/test_phystokens.py
@@ -1,7 +1,7 @@
 """Tests for Coverage.py's improved tokenizer."""
 
 import os, re
-from test.coveragetest import CoverageTest
+from tests.coveragetest import CoverageTest
 from coverage.phystokens import source_token_lines
 
 
diff --git a/test/test_process.py b/tests/test_process.py
index bf22cc9d..f3d6c56d 100644
--- a/test/test_process.py
+++ b/tests/test_process.py
@@ -4,7 +4,7 @@ import glob, os, sys, textwrap
 from nose.plugins.skip import SkipTest
 import coverage
 
-from test.coveragetest import CoverageTest
+from tests.coveragetest import CoverageTest
 
 here = os.path.dirname(__file__)
 
@@ -327,8 +327,8 @@ class ProcessTest(CoverageTest):
     if sys.version_info >= (2, 6):  # Doesn't work in 2.5, and I don't care!
         def test_coverage_run_dashm_is_like_python_dashm(self):
             # These -m commands assume the coverage tree is on the path.
-            out = self.run_command("coverage run -m test.try_execfile")
-            out2 = self.run_command("python -m test.try_execfile")
+            out = self.run_command("coverage run -m tests.try_execfile")
+            out2 = self.run_command("python -m tests.try_execfile")
             self.assertMultiLineEqual(out, out2)
 
     if 0:   # Expected failure
diff --git a/test/test_results.py b/tests/test_results.py
index 3caa5a66..92c174b6 100644
--- a/test/test_results.py
+++ b/tests/test_results.py
@@ -1,7 +1,7 @@
 """Tests for Coverage.py's results analysis."""
 
 from coverage.results import Numbers
-from test.coveragetest import CoverageTest
+from tests.coveragetest import CoverageTest
 
 
 class NumbersTest(CoverageTest):
diff --git a/test/test_summary.py b/tests/test_summary.py
index 5bb903a6..22021997 100644
--- a/test/test_summary.py
+++ b/tests/test_summary.py
@@ -5,7 +5,7 @@ import os, re, sys
 import coverage
 from coverage.backward import StringIO
 
-from test.coveragetest import CoverageTest
+from tests.coveragetest import CoverageTest
 
 class SummaryTest(CoverageTest):
     """Tests of the text summary reporting for coverage.py."""
@@ -44,15 +44,15 @@ class SummaryTest(CoverageTest):
 
         # Name                                              Stmts   Miss  Cover
         # ---------------------------------------------------------------------
-        # c:/ned/coverage/trunk/test/modules/covmod1            2      0   100%
-        # c:/ned/coverage/trunk/test/zipmods.zip/covmodzip1     2      0   100%
+        # c:/ned/coverage/trunk/tests/modules/covmod1           2      0   100%
+        # c:/ned/coverage/trunk/tests/zipmods.zip/covmodzip1    2      0   100%
         # mycode                                                4      0   100%
         # ---------------------------------------------------------------------
         # TOTAL                                                 8      0   100%
 
         self.assertNotIn("/coverage/__init__/", report)
-        self.assertIn("/test/modules/covmod1 ", report)
-        self.assertIn("/test/zipmods.zip/covmodzip1 ", report)
+        self.assertIn("/tests/modules/covmod1 ", report)
+        self.assertIn("/tests/zipmods.zip/covmodzip1 ", report)
         self.assertIn("mycode ", report)
         self.assertEqual(self.last_line_squeezed(report), "TOTAL 8 0 100%")
 
@@ -67,8 +67,8 @@ class SummaryTest(CoverageTest):
 
         self.assertEqual(self.line_count(report), 3)
         self.assertNotIn("/coverage/", report)
-        self.assertNotIn("/test/modules/covmod1 ", report)
-        self.assertNotIn("/test/zipmods.zip/covmodzip1 ", report)
+        self.assertNotIn("/tests/modules/covmod1 ", report)
+        self.assertNotIn("/tests/zipmods.zip/covmodzip1 ", report)
         self.assertIn("mycode ", report)
         self.assertEqual(self.last_line_squeezed(report), "mycode 4 0 100%")
 
@@ -84,8 +84,8 @@ class SummaryTest(CoverageTest):
 
         self.assertEqual(self.line_count(report), 3)
         self.assertNotIn("/coverage/", report)
-        self.assertNotIn("/test/modules/covmod1 ", report)
-        self.assertNotIn("/test/zipmods.zip/covmodzip1 ", report)
+        self.assertNotIn("/tests/modules/covmod1 ", report)
+        self.assertNotIn("/tests/zipmods.zip/covmodzip1 ", report)
         self.assertIn("mycode ", report)
         self.assertEqual(self.last_line_squeezed(report), "mycode 4 0 100%")
 
@@ -100,8 +100,8 @@ class SummaryTest(CoverageTest):
 
         self.assertEqual(self.line_count(report), 3)
         self.assertNotIn("/coverage/", report)
-        self.assertNotIn("/test/modules/covmod1 ", report)
-        self.assertNotIn("/test/zipmods.zip/covmodzip1 ", report)
+        self.assertNotIn("/tests/modules/covmod1 ", report)
+        self.assertNotIn("/tests/zipmods.zip/covmodzip1 ", report)
         self.assertIn("mycode ", report)
         self.assertEqual(self.last_line_squeezed(report), "mycode 4 0 100%")
 
@@ -259,8 +259,8 @@ class SummaryTest2(CoverageTest):
 
         report = repout.getvalue().replace('\\', '/')
         report = re.sub(r"\s+", " ", report)
-        self.assertIn("test/modules/pkg1/__init__ 1 0 100%", report)
-        self.assertIn("test/modules/pkg2/__init__ 0 0 100%", report)
+        self.assertIn("tests/modules/pkg1/__init__ 1 0 100%", report)
+        self.assertIn("tests/modules/pkg2/__init__ 0 0 100%", report)
 
 
 class ReportingReturnValue(CoverageTest):
diff --git a/test/test_templite.py b/tests/test_templite.py
index 0435c545..0435c545 100644
--- a/test/test_templite.py
+++ b/tests/test_templite.py
diff --git a/test/test_testing.py b/tests/test_testing.py
index c2d1453d..06f2eb01 100644
--- a/test/test_testing.py
+++ b/tests/test_testing.py
@@ -3,8 +3,8 @@
 
 import os, sys
 from coverage.backward import to_bytes, rpartition
-from test.backunittest import TestCase
-from test.coveragetest import CoverageTest
+from tests.backunittest import TestCase
+from tests.coveragetest import CoverageTest
 
 from coverage.backward import set                   # pylint: disable=W0622
 
diff --git a/test/test_xml.py b/tests/test_xml.py
index 204b5869..1659aa0a 100644
--- a/test/test_xml.py
+++ b/tests/test_xml.py
@@ -3,7 +3,7 @@
 import os, re
 import coverage
 
-from test.coveragetest import CoverageTest
+from tests.coveragetest import CoverageTest
 
 class XmlReportTest(CoverageTest):
     """Tests of the XML reports from coverage.py."""
diff --git a/test/try_execfile.py b/tests/try_execfile.py
index 9bbabd1a..9bbabd1a 100644
--- a/test/try_execfile.py
+++ b/tests/try_execfile.py
diff --git a/tox.ini b/tox.ini
index a09ddbbe..7e78ea4a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,10 +10,10 @@ envlist = py25, py26, py27, py31, py32, py33, pypy
 commands =
     {envpython} setup.py --quiet clean develop
 
-    # Create test/zipmods.zip
+    # Create tests/zipmods.zip
     # Install the egg1 egg
     # Remove the C extension so that we can test the PyTracer
-    {envpython} igor.py zip_mods install_egg remove_extension 
+    {envpython} igor.py zip_mods install_egg remove_extension
 
     # Test with the PyTracer
     {envpython} igor.py test_with_tracer py {posargs}
@@ -28,5 +28,5 @@ deps =
 
 [testenv:pypy]
 # PyPy has no C extensions
-setenv = 
+setenv =
     COVERAGE_NO_EXTENSION=1