diff --git a/Pipfile b/Pipfile
index d16d4d6d1..3c66bfa54 100644
--- a/Pipfile
+++ b/Pipfile
@@ -14,6 +14,7 @@ libtmux = {path = ".",editable = true}
 black = "==19.3b0"
 sphinx-issues = "*"
 pytest-cov = "*"
+coverage = "*"
 
 [packages]
 
diff --git a/Pipfile.lock b/Pipfile.lock
index 59c08e2c5..df571b5da 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "b2a0c5c273de1ffa6b33cd7693b2300424777eafd81713ab2b17d5bf21dc9b0d"
+            "sha256": "14762a9227e306c249f69e3e27aa089d4e3aebb8e7cfee87e2b6ffb0849592f1"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -115,6 +115,7 @@
                 "sha256:fcd4459fe35a400b8f416bc57906862693c9f88b66dc925e7f2a933e77f6b18b",
                 "sha256:ff3936dd5feaefb4f91c8c1f50a06c588b5dc69fba4f7d9c79a6617ad80bb7df"
             ],
+            "index": "pypi",
             "version": "==5.0.1"
         },
         "docutils": {
@@ -155,6 +156,14 @@
             ],
             "version": "==1.1.0"
         },
+        "importlib-metadata": {
+            "hashes": [
+                "sha256:073a852570f92da5f744a3472af1b61e28e9f78ccf0c9117658dc32b15de7b45",
+                "sha256:d95141fbfa7ef2ec65cfd945e2af7e5a6ddbd7c8d9a25e66ff3be8e3daf9f60f"
+            ],
+            "markers": "python_version < '3.8'",
+            "version": "==1.3.0"
+        },
         "isort": {
             "hashes": [
                 "sha256:54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1",
@@ -392,6 +401,13 @@
                 "sha256:f4ebe71925af7b40a864553f761ed559b43544f8f71746c2d756c7fe788ade7c"
             ],
             "version": "==0.1.7"
+        },
+        "zipp": {
+            "hashes": [
+                "sha256:3718b1cbcd963c7d4c5511a8240812904164b7f381b647143a89d3b98f9bcd8e",
+                "sha256:f06903e9f1f43b12d371004b4ac7b06ab39a44adc747266928ae6debfa7b3335"
+            ],
+            "version": "==0.6.0"
         }
     }
 }
diff --git a/requirements/test.txt b/requirements/test.txt
index 67f7b6daa..9ffd09339 100644
--- a/requirements/test.txt
+++ b/requirements/test.txt
@@ -1 +1,3 @@
-pytest==4.5.0
+pytest<6
+pytest-cov
+coverage
diff --git a/setup.py b/setup.py
index 78aee8612..0bd9633f3 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,6 @@
 import sys
 
 from setuptools import setup
-from setuptools.command.test import test as TestCommand
 
 about = {}
 with open("libtmux/__about__.py") as fp:
@@ -26,20 +25,6 @@
 history = open('CHANGES').read().replace('.. :changelog:', '')
 
 
-class PyTest(TestCommand):
-    user_options = [('pytest-args=', 'a', "Arguments to pass to py.test")]
-
-    def initialize_options(self):
-        TestCommand.initialize_options(self)
-        self.pytest_args = []
-
-    def run_tests(self):
-        import pytest
-
-        errno = pytest.main(self.pytest_args)
-        sys.exit(errno)
-
-
 setup(
     name=about['__title__'],
     version=about['__version__'],
@@ -58,7 +43,6 @@ def run_tests(self):
     packages=['libtmux'],
     include_package_data=True,
     tests_require=tests_reqs,
-    cmdclass={'test': PyTest},
     zip_safe=False,
     keywords=about['__title__'],
     classifiers=[