diff --git a/Makefile b/Makefile
index 5b0f799..7b93655 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ lint-roll:
 	$(MAKE) lint
 
 test:
-	py.test tests
+	pytest tests
 
 test-all:
 	tox
diff --git a/pytest.ini b/pytest.ini
index d53de3a..f5fdc0e 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -4,4 +4,4 @@ python_paths= .
 xfail_strict=true
 
 [pytest-watch]
-runner= py.test --failed-first --maxfail=1 --no-success-flaky-report
+runner= pytest --failed-first --maxfail=1 --no-success-flaky-report
diff --git a/tox.ini b/tox.ini
index 34a66b4..066b377 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,7 +22,7 @@ ignore=
 [testenv]
 usedevelop=True
 commands=
-    core: py.test {posargs:tests/core}
+    core: pytest {posargs:tests/core}
     doctest: make -C {toxinidir}/docs doctest
 basepython =
     doctest: python