diff --git a/setup.py b/setup.py
index 45bddf937..83defd82b 100644
--- a/setup.py
+++ b/setup.py
@@ -680,7 +680,7 @@ setup(
     include_package_data=True,
     packages=find_packages(),
     scripts=glob.glob("Scripts/pil*.py"),
-    test_suite='test.helper.TestSuite',
+    test_suite='PIL.tests',
     keywords=["Imaging",],
     license='Standard PIL License',
     zip_safe=True,
diff --git a/test/__init__.py b/test/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/test/helper.py b/test/helper.py
index 588b4f0ec..567fc3945 100644
--- a/test/helper.py
+++ b/test/helper.py
@@ -308,6 +308,3 @@ def lena(mode="RGB", cache={}):
 #
 #
 # _setup()
-
-TestLoader = unittest.TestLoader()
-TestSuite = TestLoader.discover(start_dir='.')