diff --git a/pytest.ini b/pytest.ini
index 01c7b1bf..89aeb302 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,4 +1,5 @@
 [pytest]
+addopts = -x --tb=short
 python_paths = .
 norecursedirs = .tox .git */migrations/* */static/* docs venv */{{cookiecutter.project_slug}}/*
 markers =
diff --git a/tox.ini b/tox.ini
index 8306ccf2..7ee93915 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,15 +4,15 @@ envlist = py36,flake8,black,black-template
 
 [testenv]
 deps = -rrequirements.txt
-commands = pytest -n 3 -m "not flake8" -m "not black" {posargs:./tests}
+commands = pytest -m "not flake8" -m "not black" {posargs:./tests}
 
 [testenv:flake8]
 deps = -rrequirements.txt
-commands = pytest -n 3 -m flake8 {posargs:./tests}
+commands = pytest -m flake8 {posargs:./tests}
 
 [testenv:black]
 deps = -rrequirements.txt
-commands = pytest -n 3 -m black {posargs:./tests}
+commands = pytest -m black {posargs:./tests}
 
 [testenv:black-template]
 deps = black