diff --git a/.travis.yml b/.travis.yml
index 6e26bdb..d016de1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,5 +41,5 @@ install:
 - pip install -r test_requirements.txt
 - pip install -q -e .
 script:
-- python setup.py test
+- py.test
 sudo: false
diff --git a/setup.py b/setup.py
index 8db714b..2425e9e 100755
--- a/setup.py
+++ b/setup.py
@@ -22,12 +22,9 @@ setup(
     ),
     author='Adam Coddington',
     author_email='me@adamcoddington.net',
-    tests_require=tests_require,
     extras_require={
-        'test': tests_require,
         'gmail-oauth2': gmail_oauth2_require
     },
-    test_suite='django_mailbox.runtests.runtests',
     classifiers=[
         'Framework :: Django',
         'Intended Audience :: Developers',
diff --git a/test_requirements.txt b/test_requirements.txt
index dfb4f23..3e5e40e 100644
--- a/test_requirements.txt
+++ b/test_requirements.txt
@@ -1,2 +1,3 @@
 pytest==2.9.1
 pytest-django==2.9.1
+mock==2.0.0