diff --git a/setup.py b/setup.py
index 8a8202e6ffd4f9a70e2c9f5b1fac0f0c9323778e..aadf8a71e0b1ce5c38032ffe2e3ff41d5c41f915 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,6 @@ import tempfile
 from distutils.command.build_clib import build_clib as _build_clib
 
 from setuptools import setup
-from setuptools.command.test import test as TestCommand
 
 import nacl
 
@@ -39,9 +38,6 @@ def which(name, flags=os.X_OK):  # Taken from twisted
                 result.append(pext)
     return result
 
-
-
-
 try:
     import nacl.nacl
 except ImportError:
@@ -172,18 +168,6 @@ class build_clib(_build_clib):
         return _build_clib.build_libraries(self, libraries)
 
 
-class PyTest(TestCommand):
-    def finalize_options(self):
-        TestCommand.finalize_options(self)
-        self.test_args = []
-        self.test_suite = True
-
-    def run_tests(self):
-        import pytest
-        errno = pytest.main(self.test_args)
-        sys.exit(errno)
-
-
 setup(
     name=nacl.__title__,
     version=nacl.__version__,
@@ -351,7 +335,6 @@ setup(
     zip_safe=False,
     cmdclass={
         "build_clib": build_clib,
-        "test": PyTest,
     },
 
     classifiers=[
diff --git a/tasks.py b/tasks.py
deleted file mode 100644
index 1e42d4b90aa2728f2f561f41d7d254219fad7682..0000000000000000000000000000000000000000
--- a/tasks.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from invoke import Collection, task, run
-
-from nacl.invoke import sodium
-
-ns = Collection()
-ns.add_collection(sodium)
-
-
-@ns.add_task
-@task
-def tests():
-    run("py.test")