diff --git a/Makefile b/Makefile
index 5b0f7997..7b93655c 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 d53de3aa..f5fdc0ec 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/setup.py b/setup.py
index 43082949..55b3c90c 100644
--- a/setup.py
+++ b/setup.py
@@ -5,9 +5,10 @@ from setuptools import (
     find_packages,
 )
 
-extras_require={
+extras_require = {
     'test': [
         "pytest==3.3.2",
+        "pytest-xdist",
         "tox>=2.9.1,<3",
     ],
     'lint': [
@@ -20,7 +21,6 @@ extras_require={
     ],
     'dev': [
         "bumpversion>=0.5.3,<1",
-        "pytest-xdist",
         "pytest-watch>=4.1.0,<5",
         "wheel",
         "ipython",
@@ -28,10 +28,10 @@ extras_require={
 }
 
 extras_require['dev'] = (
-    extras_require['dev']
-    + extras_require['test']
-    + extras_require['lint']
-    + extras_require['doc']
+    extras_require['dev'] +
+    extras_require['test'] +
+    extras_require['lint'] +
+    extras_require['doc']
 )
 
 setup(
diff --git a/tox.ini b/tox.ini
index 34a66b4d..74ea1d4e 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
@@ -38,5 +38,5 @@ whitelist_externals=make
 basepython=python
 extras=lint
 commands=
-  flake8 {toxinidir}/<MODULE_NAME> {toxinidir}/tests
-  isort --recursive --check-only --diff {toxinidir}/<MODULE_NAME> {toxinidir}/tests
+    flake8 {toxinidir}/<MODULE_NAME> {toxinidir}/tests
+    isort --recursive --check-only --diff {toxinidir}/<MODULE_NAME> {toxinidir}/tests