diff --git a/.travis.yml b/.travis.yml
index 78a7e2e30..3ae28aee7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,6 +53,7 @@ script:
   - coverage run --source ../modoboa manage.py test modoboa.core modoboa.lib modoboa.admin modoboa.limits modoboa.transport modoboa.relaydomains modoboa.dnstools modoboa.ldapsync modoboa.policyd
 
 after_success:
+  - coverage combine
   - coverage xml
   - codecov
   - python-codacy-coverage -r coverage.xml
diff --git a/test_project/.coveragerc b/test_project/.coveragerc
index b9823a198..5dfc148ab 100644
--- a/test_project/.coveragerc
+++ b/test_project/.coveragerc
@@ -1,3 +1,4 @@
 [run]
 branch = True
 concurrency = multiprocessing
+parallel = True