diff --git a/Makefile b/Makefile
index 299f5fa1..9f2ee92f 100644
--- a/Makefile
+++ b/Makefile
@@ -49,10 +49,10 @@ lint:
 	flake8 organizations
 
 test:
-	py.test ${TEST_FLAGS}
+	pytest ${TEST_FLAGS}
 
 test-coverage: clean-test
-	-py.test ${COVER_FLAGS} ${TEST_FLAGS}
+	-pytest ${COVER_FLAGS} ${TEST_FLAGS}
 	@exit_code=$?
 	@-coverage html
 	@exit ${exit_code}
diff --git a/tox.ini b/tox.ini
index 72411861..b10fe780 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@ envlist =
 [testenv]
 setenv =
     PYTHONPATH = {toxinidir}:{toxinidir}/organizations
-commands = py.test --cov=organizations
+commands = pytest --cov=organizations
 basepython =
     py27: python2.7
     py34: python3.4