diff --git a/.coveragerc b/.coveragerc
index 71a50793b..9d0e89693 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -10,6 +10,8 @@ exclude_lines =
 ignore_errors = True
 
 [run]
+concurrency = multiprocessing
+source = dmoj
 omit =
     dmoj/cli.py
     dmoj/citest.py
diff --git a/.travis.yml b/.travis.yml
index 32fc23e85..cc1276460 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,8 +53,9 @@ script:
     #!/bin/bash -e
     . ~/.profile
     cd /code
-    "$PYTHON" -m coverage run --source=dmoj -m unittest discover dmoj/tests/
-    "$PYTHON" -m coverage run --append --source=dmoj .docker.test.py
+    "$PYTHON" -m coverage run -m unittest discover dmoj/tests/
+    "$PYTHON" -m coverage run --append .docker.test.py
+    "$PYTHON" -m coverage combine
     "$PYTHON" -m coverage xml
     EOF
   - chmod a+x run run-su