diff --git a/.travis.yml b/.travis.yml
index e456e0cd..c76e029b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,6 @@ python:
   - "3.4"
   - "3.5"
   - "3.6"
-  - "3.7-dev"
   # - "pypy"  -- appears to hang
   # - "pypy3"
 # command to install dependencies
@@ -16,7 +15,7 @@ install: "make"
 script:
   - |
     if [[ "$TRAVIS_PYTHON_VERSION" != "2.6" ]] ; then make test-readme; fi
-  - make coverage
+  - make test
 after_success:
   - pipenv run codecov
 cache: pip
diff --git a/Makefile b/Makefile
index a25d2c65..5bc45550 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 --boxed -n 9 tests/
+	python setup.py test
 
 test-readme:
 	python setup.py check -r -s