diff --git a/Makefile b/Makefile
index f19a72e1..5eadf3b5 100644
--- a/Makefile
+++ b/Makefile
@@ -5,11 +5,14 @@ test:
 	# This runs all of the tests, on both Python 2 and Python 3.
 	detox
 ci:
-	python setup.py test
+	py.test -n 8 --boxed --junitxml=report.xml
 
 test-readme:
 	python setup.py check -r -s
 
+flake8:
+	flake8 --ignore=E501 requests
+
 coverage:
 	py.test --cov-config .coveragerc --verbose --cov-report term --cov-report xml --cov=requests tests
 
@@ -21,4 +24,4 @@ publish:
 
 docs:
 	cd docs && make html
-	@echo "\033[95m\n\nBuild successful! View the docs homepage at docs/_build/html/index.html.\n\033[0m"
+	@echo "\033[95m\n\nBuild successful! View the docs homepage at docs/_build/html/index.html.\n\033[0m"
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 093f45ed..8d79283f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,5 +10,7 @@ readme_renderer
 Sphinx<=1.5.5
 PySocks
 setuptools>=18.5
+docutils
+flake8
 tox
-detox
\ No newline at end of file
+detox