diff --git a/requirements-testing.txt b/requirements-testing.txt
index 40a70e6..ae46b3b 100644
--- a/requirements-testing.txt
+++ b/requirements-testing.txt
@@ -1,3 +1,3 @@
-pytest-cov==1.8.1
+pytest-cov==2.6.1
 pytest-pep8==1.0.6
-python-coveralls==2.4.3
+python-coveralls==2.9.1
diff --git a/setup.py b/setup.py
index a7420b6..6395f84 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,6 @@
 import sys
 
 from setuptools import setup, find_packages
-from setuptools.command.test import test as TestCommand
 
 dirname = os.path.dirname(__file__)
 
@@ -13,22 +12,9 @@
     long_description += '\n' + f.read()
 
 
-class PyTest(TestCommand):
-    def finalize_options(self):
-        TestCommand.finalize_options(self)
-        self.test_args = 'tests'
-        self.test_suite = True
-
-    def run_tests(self):
-        # import here, cause outside the eggs aren't loaded
-        import pytest
-        errno = pytest.main(self.test_args)
-        sys.exit(errno)
-
-
 setup(
     name='poultry',
-    version='1.4.0',
+    version='1.5.2',
     description='A tweet collection manager.',
     long_description=long_description,
     # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
@@ -41,7 +27,6 @@ def run_tests(self):
         'Operating System :: Microsoft :: Windows',
         'Operating System :: MacOS :: MacOS X',
         'Topic :: Utilities',
-        'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 3',
     ],
     keywords='',
@@ -63,7 +48,6 @@ def run_tests(self):
             'poultry = poultry.main:dispatch',
         ],
     },
-    cmdclass={'test': PyTest},
     tests_require=[
         'pytest>=2.4.2',
     ],
diff --git a/tox.ini b/tox.ini
index 7c88f86..d7a04bc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,10 +4,11 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py27,py34,py33,pypy
+envlist = py36
 
 [testenv]
-commands = py.test tests README.rst --pep8 --junitxml={envlogdir}/junit-{envname}.xml []
+#commands = py.test tests README.rst --pep8 --junitxml={envlogdir}/junit-{envname}.xml []
+commands = py.test tests README.rst []
 deps = -r{toxinidir}/requirements-testing.txt
 
 [pytest]