diff --git a/.coveragerc b/.coveragerc
new file mode 100644
index 0000000000000000000000000000000000000000..435f0d724e15af4ac4e75fe72a76211269138f62
--- /dev/null
+++ b/.coveragerc
@@ -0,0 +1,2 @@
+[run]
+concurrency=multiprocessing
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 47b349ff0fce3c58ee87abb1c0eafc8ee8330afa..0394fae3f9846099fc0e0eae1e6c32bee3888ba0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,6 +5,8 @@ envlist = py36
 exclude = venv,.tox
 
 [testenv]
+setenv = 
+    COVERAGE_PROCESS_START=.coveragerc
 deps =
     coverage
     flake8
@@ -13,6 +15,7 @@ deps =
 commands =
     coverage erase
     coverage run --source brian_dashboard_manager -m py.test {posargs}
+    coverage combine
     coverage xml
     coverage html
     coverage report --fail-under 75