diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index e2e468aa9ae..e652f17c94b 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -29,7 +29,7 @@ assignees: ""
    - create a new virtualenv (make sure it's the same Python version);
    - clone this repository;
    - run `pip install -e .`;
-   - make sure it's sane by running `python setup.py test`; and
+   - make sure it's sane by running `python -m unittest`; and
    - run `black` like you did last time.
 
 **Additional context** Add any other context about the problem here.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index de734da0eab..c2671daa153 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -27,4 +27,4 @@ jobs:
 
       - name: Unit tests
         run: |
-          coverage run tests/test_black.py
+          coverage run -m unittest
diff --git a/.travis.yml b/.travis.yml
index ec241725856..19b60a490d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ cache:
   directories:
     - $HOME/.cache/pre-commit
 env:
-  - TEST_CMD="coverage run tests/test_black.py"
+  - TEST_CMD="coverage run -m unittest"
 install:
   - pip install coverage coveralls pre-commit
   - pip install -e '.[d]'
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d6202758d21..91e5320e283 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -37,7 +37,7 @@ from the cloned _Black_ repo. It will do the correct thing.
 Before submitting pull requests, run tests with:
 
 ```
-$ python setup.py test
+$ python -m unittest
 ```
 
 ## Hygiene
diff --git a/setup.py b/setup.py
index fb3b91ff9fd..61921318550 100644
--- a/setup.py
+++ b/setup.py
@@ -78,7 +78,6 @@ def get_long_description() -> str:
         "mypy_extensions>=0.4.3",
     ],
     extras_require={"d": ["aiohttp>=3.3.2", "aiohttp-cors"]},
-    test_suite="tests.test_black",
     classifiers=[
         "Development Status :: 4 - Beta",
         "Environment :: Console",
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d