diff --git a/Makefile b/Makefile
index e340e62a..7f34b4a4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 PROJ=django_celery_beat
 PGPIDENT="Celery Security Team"
 PYTHON=python
-PYTEST=py.test
+PYTEST=pytest
 GIT=git
 TOX=tox
 ICONV=iconv
diff --git a/setup.py b/setup.py
index 07805b97..3b4696f7 100644
--- a/setup.py
+++ b/setup.py
@@ -117,7 +117,7 @@ def reqs(*f):
 
 
 class pytest(setuptools.command.test.test):
-    user_options = [('pytest-args=', 'a', 'Arguments to pass to py.test')]
+    user_options = [('pytest-args=', 'a', 'Arguments to pass to pytest')]
 
     def initialize_options(self):
         setuptools.command.test.test.initialize_options(self)
diff --git a/tox.ini b/tox.ini
index 84243848..57ca239a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -34,7 +34,7 @@ sitepackages = False
 recreate = False
 commands =
     pip list
-    py.test -xv
+    pytest -xv
 
 
 [testenv:apicheck]
@@ -64,4 +64,4 @@ commands =
     pip install -U https://github.com/celery/celery/zipball/master#egg=celery
     pip install -U https://github.com/celery/kombu/zipball/master#egg=kombu
     pip install Django
-    py.test -x --cov=django_celery_beat --cov-report=xml --no-cov-on-fail
+    pytest -x --cov=django_celery_beat --cov-report=xml --no-cov-on-fail