diff --git a/tests/__init__.py b/tests/__init__.py
index 0ed17c30..2d1b979d 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    flask.testsuite
+    tests
     ~~~~~~~~~~~~~~~
 
     Tests Flask itself.  The majority of Flask is already tested
diff --git a/tests/appctx.py b/tests/test_appctx.py
similarity index 98%
rename from tests/appctx.py
rename to tests/test_appctx.py
index 55f7dcba..65e9e86d 100644
--- a/tests/appctx.py
+++ b/tests/test_appctx.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    flask.testsuite.appctx
+    tests.appctx
     ~~~~~~~~~~~~~~~~~~~~~~
 
     Tests the application context.
@@ -11,7 +11,7 @@
 
 import flask
 import unittest
-from flask.testsuite import FlaskTestCase
+from tests import FlaskTestCase
 
 
 class AppContextTestCase(FlaskTestCase):
diff --git a/tests/basic.py b/tests/test_basic.py
similarity index 99%
rename from tests/basic.py
rename to tests/test_basic.py
index 6c2525f9..1cc20ee0 100644
--- a/tests/basic.py
+++ b/tests/test_basic.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    flask.testsuite.basic
+    tests.basic
     ~~~~~~~~~~~~~~~~~~~~~
 
     The basic functionality.
@@ -17,7 +17,7 @@ import pickle
 import unittest
 from datetime import datetime
 from threading import Thread
-from flask.testsuite import FlaskTestCase, emits_module_deprecation_warning
+from tests import FlaskTestCase, emits_module_deprecation_warning
 from flask._compat import text_type
 from werkzeug.exceptions import BadRequest, NotFound, Forbidden
 from werkzeug.http import parse_date
diff --git a/tests/blueprints.py b/tests/test_blueprints.py
similarity index 99%
rename from tests/blueprints.py
rename to tests/test_blueprints.py
index 8d3224a3..a5488a57 100644
--- a/tests/blueprints.py
+++ b/tests/test_blueprints.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    flask.testsuite.blueprints
+    tests.blueprints
     ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Blueprints (and currently modules)
@@ -11,7 +11,7 @@
 
 import flask
 import unittest
-from flask.testsuite import FlaskTestCase
+from tests import FlaskTestCase
 from flask._compat import text_type
 from werkzeug.http import parse_cache_control_header
 from jinja2 import TemplateNotFound
diff --git a/tests/config.py b/tests/test_config.py
similarity index 99%
rename from tests/config.py
rename to tests/test_config.py
index 4772fa77..4f9e693f 100644
--- a/tests/config.py
+++ b/tests/test_config.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    flask.testsuite.config
+    tests.config
     ~~~~~~~~~~~~~~~~~~~~~~
 
     Configuration and instances.
@@ -15,7 +15,7 @@ import flask
 import pkgutil
 import unittest
 from contextlib import contextmanager
-from flask.testsuite import FlaskTestCase
+from tests import FlaskTestCase
 from flask._compat import PY2
 
 
diff --git a/tests/deprecations.py b/tests/test_deprecations.py
similarity index 82%
rename from tests/deprecations.py
rename to tests/test_deprecations.py
index 2d77925e..7353af5a 100644
--- a/tests/deprecations.py
+++ b/tests/test_deprecations.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    flask.testsuite.deprecations
+    tests.deprecations
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Tests deprecation support.
@@ -11,7 +11,7 @@
 
 import flask
 import unittest
-from flask.testsuite import FlaskTestCase, catch_warnings
+from tests import FlaskTestCase, catch_warnings
 
 
 class DeprecationsTestCase(FlaskTestCase):
diff --git a/tests/examples.py b/tests/test_examples.py
similarity index 92%
rename from tests/examples.py
rename to tests/test_examples.py
index 1ea3e6cc..c321a141 100644
--- a/tests/examples.py
+++ b/tests/test_examples.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    flask.testsuite.examples
+    tests.examples
     ~~~~~~~~~~~~~~~~~~~~~~~~
 
     Tests the examples.
@@ -10,7 +10,7 @@
 """
 import os
 import unittest
-from flask.testsuite import add_to_path
+from tests import add_to_path
 
 
 def setup_path():
diff --git a/tests/ext.py b/tests/test_ext.py
similarity index 98%
rename from tests/ext.py
rename to tests/test_ext.py
index 5ec6ec63..110657d8 100644
--- a/tests/ext.py
+++ b/tests/test_ext.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    flask.testsuite.ext
+    tests.ext
     ~~~~~~~~~~~~~~~~~~~
 
     Tests the extension import thing.
@@ -15,7 +15,7 @@ try:
     from imp import reload as reload_module
 except ImportError:
     reload_module = reload
-from flask.testsuite import FlaskTestCase
+from tests import FlaskTestCase
 from flask._compat import PY2
 
 class ExtImportHookTestCase(FlaskTestCase):
diff --git a/tests/helpers.py b/tests/test_helpers.py
similarity index 99%
rename from tests/helpers.py
rename to tests/test_helpers.py
index e08a2283..c923cae1 100644
--- a/tests/helpers.py
+++ b/tests/test_helpers.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    flask.testsuite.helpers
+    tests.helpers
     ~~~~~~~~~~~~~~~~~~~~~~~
 
     Various helpers.
@@ -13,7 +13,7 @@ import os
 import flask
 import unittest
 from logging import StreamHandler
-from flask.testsuite import FlaskTestCase, catch_warnings, catch_stderr
+from tests import FlaskTestCase, catch_warnings, catch_stderr
 from werkzeug.http import parse_cache_control_header, parse_options_header
 from flask._compat import StringIO, text_type
 
diff --git a/tests/regression.py b/tests/test_regression.py
similarity index 97%
rename from tests/regression.py
rename to tests/test_regression.py
index ad06aa59..8bdbbf6d 100644
--- a/tests/regression.py
+++ b/tests/test_regression.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    flask.testsuite.regression
+    tests.regression
     ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Tests regressions.
@@ -16,7 +16,7 @@ import flask
 import threading
 import unittest
 from werkzeug.exceptions import NotFound
-from flask.testsuite import FlaskTestCase
+from tests import FlaskTestCase
 
 
 _gc_lock = threading.Lock()
diff --git a/tests/reqctx.py b/tests/test_reqctx.py
similarity index 98%
rename from tests/reqctx.py
rename to tests/test_reqctx.py
index c8954824..4ea04098 100644
--- a/tests/reqctx.py
+++ b/tests/test_reqctx.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    flask.testsuite.reqctx
+    tests.reqctx
     ~~~~~~~~~~~~~~~~~~~~~~
 
     Tests the request context.
@@ -15,7 +15,7 @@ try:
     from greenlet import greenlet
 except ImportError:
     greenlet = None
-from flask.testsuite import FlaskTestCase
+from tests import FlaskTestCase
 
 
 class RequestContextTestCase(FlaskTestCase):
diff --git a/tests/signals.py b/tests/test_signals.py
similarity index 98%
rename from tests/signals.py
rename to tests/test_signals.py
index 93f1c7c8..d05b5b27 100644
--- a/tests/signals.py
+++ b/tests/test_signals.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    flask.testsuite.signals
+    tests.signals
     ~~~~~~~~~~~~~~~~~~~~~~~
 
     Signalling.
@@ -11,7 +11,7 @@
 
 import flask
 import unittest
-from flask.testsuite import FlaskTestCase
+from tests import FlaskTestCase
 
 
 class SignalsTestCase(FlaskTestCase):
diff --git a/tests/subclassing.py b/tests/test_subclassing.py
similarity index 93%
rename from tests/subclassing.py
rename to tests/test_subclassing.py
index 24c823ae..41e587e7 100644
--- a/tests/subclassing.py
+++ b/tests/test_subclassing.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    flask.testsuite.subclassing
+    tests.subclassing
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Test that certain behavior of flask can be customized by
@@ -12,7 +12,7 @@
 import flask
 import unittest
 from logging import StreamHandler
-from flask.testsuite import FlaskTestCase
+from tests import FlaskTestCase
 from flask._compat import StringIO
 
 
diff --git a/tests/templating.py b/tests/test_templating.py
similarity index 99%
rename from tests/templating.py
rename to tests/test_templating.py
index 435ace21..5ce67d97 100644
--- a/tests/templating.py
+++ b/tests/test_templating.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    flask.testsuite.templating
+    tests.templating
     ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Template functionality
@@ -14,7 +14,7 @@ import unittest
 import logging
 from jinja2 import TemplateNotFound
 
-from flask.testsuite import FlaskTestCase
+from tests import FlaskTestCase
 
 
 class TemplatingTestCase(FlaskTestCase):
diff --git a/tests/testing.py b/tests/test_testing.py
similarity index 99%
rename from tests/testing.py
rename to tests/test_testing.py
index 25924839..3a51c59f 100644
--- a/tests/testing.py
+++ b/tests/test_testing.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    flask.testsuite.testing
+    tests.testing
     ~~~~~~~~~~~~~~~~~~~~~~~
 
     Test client and more.
@@ -11,7 +11,7 @@
 
 import flask
 import unittest
-from flask.testsuite import FlaskTestCase
+from tests import FlaskTestCase
 from flask._compat import text_type
 
 
diff --git a/tests/views.py b/tests/test_views.py
similarity index 98%
rename from tests/views.py
rename to tests/test_views.py
index bd572b24..f98f920b 100644
--- a/tests/views.py
+++ b/tests/test_views.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    flask.testsuite.views
+    tests.views
     ~~~~~~~~~~~~~~~~~~~~~
 
     Pluggable views.
@@ -12,7 +12,7 @@
 import flask
 import flask.views
 import unittest
-from flask.testsuite import FlaskTestCase
+from tests import FlaskTestCase
 from werkzeug.http import parse_set_header
 
 class ViewTestCase(FlaskTestCase):