diff --git a/.gitignore b/.gitignore
index e505984..2716883 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,4 @@ _build/
 *.mo
 .vagrant/
 gnuviechadmin/assets/
+coverage-report/
diff --git a/gnuviechadmin/.coveragerc b/gnuviechadmin/setup.cfg
similarity index 55%
rename from gnuviechadmin/.coveragerc
rename to gnuviechadmin/setup.cfg
index a787368..e83e084 100644
--- a/gnuviechadmin/.coveragerc
+++ b/gnuviechadmin/setup.cfg
@@ -1,5 +1,16 @@
-[run]
-source = gnuviechadmin,contact_form,dashboard,domains,gvawebcore,managemails,osusers,taskresults,userdbs
+[pep8]
+exclude = migrations
 
-[report]
+[flake8]
+exclude = migrations
+
+[coverage:run]
+source = gnuviechadmin,contact_form,dashboard,domains,gvawebcore,managemails,osusers,taskresults,userdbs
+branch = True
+
+[coverage:report]
 omit = */migrations/*,*/tests/*.py,*/tests.py,gnuviechadmin/settings/local.py,gnuviechadmin/settings/production.py
+show_missing = True
+
+[coverage:html]
+directory = ../coverage-report