diff --git a/testing/plugin/__init__.py b/testing/plugin/__init__.py
deleted file mode 100644
index 792d60054..000000000
--- a/testing/plugin/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/testing/plugin/conftest.py b/testing/plugin/conftest.py
deleted file mode 100644
index 2777f0c12..000000000
--- a/testing/plugin/conftest.py
+++ /dev/null
@@ -1,36 +0,0 @@
-import py
-
-import _pytest
-plugindir = py.path.local(_pytest.__file__).dirpath()
-from _pytest.core import default_plugins
-
-def pytest_collect_file(path, parent):
-    if path.basename.startswith("pytest_") and path.ext == ".py":
-        mod = parent.Module(path, parent=parent)
-        return mod
-
-# for plugin test we try to automatically make sure that
-# the according plugin is loaded
-def pytest_funcarg__testdir(request):
-    testdir = request.getfuncargvalue("testdir")
-    #for obj in (request.cls, request.module):
-    #    if hasattr(obj, 'testplugin'):
-    #        testdir.plugins.append(obj.testplugin)
-    #        break
-    #else:
-    modname = request.module.__name__.split(".")[-1]
-    if modname.startswith("test_pytest_"):
-        modname = modname[5:]
-        if plugindir.join("%s.py" % modname).check():
-            if modname[7:] not in default_plugins:
-                testdir.plugins.append(vars(request.module))
-                testdir.plugins.append(modname)
-    #elif modname.startswith("test_pytest"):
-    #    pname = modname[5:]
-    #    assert pname not in testdir.plugins
-    #    testdir.plugins.append(pname)
-    #    #testdir.plugins.append(vars(request.module))
-    else:
-        pass # raise ValueError("need better support code")
-    return testdir
-
diff --git a/testing/plugin/test_assertion.py b/testing/test_assertion.py
similarity index 100%
rename from testing/plugin/test_assertion.py
rename to testing/test_assertion.py
diff --git a/testing/plugin/test_capture.py b/testing/test_capture.py
similarity index 100%
rename from testing/plugin/test_capture.py
rename to testing/test_capture.py
diff --git a/testing/plugin/test_doctest.py b/testing/test_doctest.py
similarity index 100%
rename from testing/plugin/test_doctest.py
rename to testing/test_doctest.py
diff --git a/testing/plugin/test_genscript.py b/testing/test_genscript.py
similarity index 100%
rename from testing/plugin/test_genscript.py
rename to testing/test_genscript.py
diff --git a/testing/plugin/test_helpconfig.py b/testing/test_helpconfig.py
similarity index 100%
rename from testing/plugin/test_helpconfig.py
rename to testing/test_helpconfig.py
diff --git a/testing/plugin/test_junitxml.py b/testing/test_junitxml.py
similarity index 100%
rename from testing/plugin/test_junitxml.py
rename to testing/test_junitxml.py
diff --git a/testing/plugin/test_mark.py b/testing/test_mark.py
similarity index 100%
rename from testing/plugin/test_mark.py
rename to testing/test_mark.py
diff --git a/testing/plugin/test_monkeypatch.py b/testing/test_monkeypatch.py
similarity index 100%
rename from testing/plugin/test_monkeypatch.py
rename to testing/test_monkeypatch.py
diff --git a/testing/plugin/test_nose.py b/testing/test_nose.py
similarity index 100%
rename from testing/plugin/test_nose.py
rename to testing/test_nose.py
diff --git a/testing/plugin/test_pastebin.py b/testing/test_pastebin.py
similarity index 100%
rename from testing/plugin/test_pastebin.py
rename to testing/test_pastebin.py
diff --git a/testing/plugin/test_pdb.py b/testing/test_pdb.py
similarity index 100%
rename from testing/plugin/test_pdb.py
rename to testing/test_pdb.py
diff --git a/testing/plugin/test_pytester.py b/testing/test_pytester.py
similarity index 100%
rename from testing/plugin/test_pytester.py
rename to testing/test_pytester.py
diff --git a/testing/plugin/test_python.py b/testing/test_python.py
similarity index 100%
rename from testing/plugin/test_python.py
rename to testing/test_python.py
diff --git a/testing/plugin/test_recwarn.py b/testing/test_recwarn.py
similarity index 100%
rename from testing/plugin/test_recwarn.py
rename to testing/test_recwarn.py
diff --git a/testing/plugin/test_resultlog.py b/testing/test_resultlog.py
similarity index 100%
rename from testing/plugin/test_resultlog.py
rename to testing/test_resultlog.py
diff --git a/testing/plugin/test_runner.py b/testing/test_runner.py
similarity index 100%
rename from testing/plugin/test_runner.py
rename to testing/test_runner.py
diff --git a/testing/plugin/test_runner_xunit.py b/testing/test_runner_xunit.py
similarity index 100%
rename from testing/plugin/test_runner_xunit.py
rename to testing/test_runner_xunit.py
diff --git a/testing/plugin/test_session.py b/testing/test_session.py
similarity index 100%
rename from testing/plugin/test_session.py
rename to testing/test_session.py
diff --git a/testing/plugin/test_skipping.py b/testing/test_skipping.py
similarity index 100%
rename from testing/plugin/test_skipping.py
rename to testing/test_skipping.py
diff --git a/testing/plugin/test_terminal.py b/testing/test_terminal.py
similarity index 100%
rename from testing/plugin/test_terminal.py
rename to testing/test_terminal.py
diff --git a/testing/plugin/test_tmpdir.py b/testing/test_tmpdir.py
similarity index 100%
rename from testing/plugin/test_tmpdir.py
rename to testing/test_tmpdir.py
diff --git a/testing/plugin/test_unittest.py b/testing/test_unittest.py
similarity index 100%
rename from testing/plugin/test_unittest.py
rename to testing/test_unittest.py