diff --git a/pytest.ini b/pytest.ini
index 4a9d2894ef96..148f12abbf40 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -9,3 +9,6 @@ python_files = test*.py
 # empty patterns for default python collector, to stick to our plugin's collector
 python_classes =
 python_functions =
+
+# always run in parallel
+addopts = -nauto
diff --git a/test-requirements.txt b/test-requirements.txt
index 2993972a5b32..0defc6aea1a4 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,3 +1,4 @@
 flake8
 typed-ast
 pytest>=2.8
+pytest-xdist>=1.13