diff --git a/Makefile b/Makefile
index 18d082117d..cef5327578 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ init:
 	python setup.py install
 
 test:
-	python setup.py test --addopts "-n auto"
+	python setup.py test
 
 lint:
 	flake8 vyper tests --ignore=E122,E124,E127,E128,E501,E731,W504
diff --git a/setup.cfg b/setup.cfg
index 3c90a124ba..68987778a0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [tool:pytest]
-addopts = --cov-report term --cov-report html --cov=vyper
+addopts = -n auto --cov-report term --cov-report html --cov=vyper
 python_files = test_*.py
 testpaths = tests
 
diff --git a/setup.py b/setup.py
index 72b678d094..f39ee5c011 100644
--- a/setup.py
+++ b/setup.py
@@ -4,9 +4,9 @@
 
 
 test_deps = [
-    'pytest',
-    'pytest-cov',
-    'pytest-xdist==1.26.1',
+    'pytest>=3.6',
+    'pytest-cov==2.6.1',
+    'pytest-xdist==1.18.1',
     'py-evm==0.2.0a39',
     'eth-tester==0.1.0b37',
     'web3==5.0.0a6'