diff --git a/.codecov.yml b/.codecov.yml
new file mode 100644
index 000000000..2b5037ed5
--- /dev/null
+++ b/.codecov.yml
@@ -0,0 +1,26 @@
+codecov:
+  notify:
+    require_ci_to_pass: yes
+
+coverage:
+  precision: 2
+  round: down
+  range: "70...100"
+
+  status:
+    project: yes
+    patch: yes
+    changes: no
+
+parsers:
+  gcov:
+    branch_detection:
+      conditional: yes
+      loop: yes
+      method: no
+      macro: no
+
+comment:
+  layout: "header, diff"
+  behavior: default
+  require_changes: no
diff --git a/.travis.yml b/.travis.yml
index 5ef9ee1a9..987b44c67 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,4 +36,4 @@ after_failure:
     - cat ../../data/nextcloud.log
 
 after_success:
-  - bash <(curl -s https://codecov.io/bash) -t 49bdd1ee-6ef5-47b9-b80f-825b51515ce9
+  - cd build && bash <(curl -s https://codecov.io/bash) -t 49bdd1ee-6ef5-47b9-b80f-825b51515ce9
diff --git a/Makefile b/Makefile
index 0a6d272bb..cf1329797 100644
--- a/Makefile
+++ b/Makefile
@@ -173,6 +173,6 @@ ifeq (, $(shell which phpunit 2> /dev/null))
 	php $(build_tools_directory)/phpunit.phar -c phpunit.integration.xml  --coverage-clover build/php-unit.clover --coverage-html build/html/
 
 else
-	phpunit -c phpunit.xml  --coverage-clover build/php-unit.clover.xml --coverage-html build/html
-	phpunit -c phpunit.integration.xml  --coverage-clover build/php-unit.integration.clover.xml --coverage-html build/html-integration
+	phpunit -c phpunit.xml  --coverage-clover build/php-unit.coverage.xml --coverage-html build/html
+	phpunit -c phpunit.integration.xml  --coverage-clover build/php-unit.integration.coverage.xml --coverage-html build/html-integration
 endif
diff --git a/phpunit.xml b/phpunit.xml
index e5fd49c33..2cbf73494 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -6,7 +6,7 @@
 </testsuites>
 <filter>
 <whitelist>
-    <directory suffix=".php">./</directory>
+    <directory suffix=".php">./lib</directory>
 </whitelist>
 </filter>
 </phpunit>