diff --git a/Makefile b/Makefile
index 5d7b9ae7..368085f1 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ init:
 test:
 	# This runs all of the tests. To run an individual test, run py.test with
 	# the -k flag, like "py.test -k test_path_is_not_double_encoded"
-	py.test tests
+	python setup.py test
 
 test-readme:
 	python setup.py check -r -s
diff --git a/circle.yml b/circle.yml
new file mode 100644
index 00000000..892407c0
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,4 @@
+dependencies:
+  override:
+    - pip install tox tox-pyenv
+    - pyenv local 2.6.8 2.7.10 3.3.3 3.4.3 3.5.0 3.6.0
\ No newline at end of file