diff --git a/pecan/tests/__init__.py b/pecan/tests/__init__.py
index bb7edf7..e69de29 100644
--- a/pecan/tests/__init__.py
+++ b/pecan/tests/__init__.py
@@ -1,10 +0,0 @@
-__all__ = ['collector']
-
-def collector():
-    try:
-        from unittest import TestLoader
-        assert hasattr(TestLoader, 'discover')
-        return TestLoader().discover('pecan.tests')
-    except:
-        import unittest2
-        return unittest2.collector
diff --git a/pecan/tests/test_config/__init__.py b/pecan/tests/test_config/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/pecan/tests/test_config/bad/__init__.py b/pecan/tests/test_config/bad/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/pecan/tests/test_config/sample_apps/sample_app/__init__.py b/pecan/tests/test_config/sample_apps/sample_app/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/pecan/tests/test_config/sample_apps/sample_app/app.py b/pecan/tests/test_config/sample_apps/sample_app/app.py
deleted file mode 100644
index dcb81fd..0000000
--- a/pecan/tests/test_config/sample_apps/sample_app/app.py
+++ /dev/null
@@ -1,3 +0,0 @@
-def setup_app(config):
-    assert config.foo.sample_key == True
-    return 'DEPLOYED!'
diff --git a/pecan/tests/test_config/sample_apps/sample_app_config.py b/pecan/tests/test_config/sample_apps/sample_app_config.py
deleted file mode 100644
index 9e01138..0000000
--- a/pecan/tests/test_config/sample_apps/sample_app_config.py
+++ /dev/null
@@ -1,9 +0,0 @@
-import sample_app
-
-app = {
-    'modules': ['sample_app']
-}
-
-foo = {
-    'sample_key': True
-}
diff --git a/pecan/tests/test_config/sample_apps/sample_app_config_missing.py b/pecan/tests/test_config/sample_apps/sample_app_config_missing.py
deleted file mode 100644
index caf3929..0000000
--- a/pecan/tests/test_config/sample_apps/sample_app_config_missing.py
+++ /dev/null
@@ -1,9 +0,0 @@
-import sample_app_missing
-
-app = {
-    'modules': ['sample_app_missing']
-}
-
-foo = {
-    'sample_key': True
-}
diff --git a/pecan/tests/test_config/sample_apps/sample_app_config_missing_app.py b/pecan/tests/test_config/sample_apps/sample_app_config_missing_app.py
deleted file mode 100644
index e69de29..0000000
diff --git a/pecan/tests/test_config/sample_apps/sample_app_missing/__init__.py b/pecan/tests/test_config/sample_apps/sample_app_missing/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/pecan/tests/test_config/sample_apps/sample_app_missing_app/__init__.py b/pecan/tests/test_config/sample_apps/sample_app_missing_app/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/pecan/tests/test_config/sample_apps/sample_app_missing_app/app.py b/pecan/tests/test_config/sample_apps/sample_app_missing_app/app.py
deleted file mode 100644
index e69de29..0000000
diff --git a/setup.py b/setup.py
index 382f6e5..2e7b671 100644
--- a/setup.py
+++ b/setup.py
@@ -65,8 +65,7 @@ setup(
     scripts              = ['bin/pecan'],
     zip_safe             = False,
     install_requires     = requirements,
-    tests_require        = tests_require,
-    test_suite           = test_suite,
+    test_suite           = 'pecan',
     entry_points         = """
     [paste.paster_command]
     pecan-serve = pecan.commands:ServeCommand