diff --git a/.travis.yml b/.travis.yml
index 7d45ac23..e6f06c97 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,8 +48,8 @@ before_script:
     - cd apps/$APP_NAME/
     - mkdir -p build
     - curl -sSL https://phar.phpunit.de/phpunit.phar -o build/phpunit.phar
-    - sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' != '1' -a '$CODECHECK' != '2' ]; then composer require codacy/coverage; fi"
-    - sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' != '1' -a '$CODECHECK' != '2' ]; then wget https://scrutinizer-ci.com/ocular.phar; fi"
+    - sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' = '1' ]; then composer require codacy/coverage; fi"
+    - sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' = '1' ]; then wget https://scrutinizer-ci.com/ocular.phar; fi"
     - sh -c "if [ '$JSTESTS' = '1' ]; then npm install; fi"
 #    - ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database $DB --database-pass=''
 
@@ -59,15 +59,15 @@ script:
     - sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' = '1' ]; then find . -name \*.php -exec php -l \"{}\" \;; fi"
     - cd ../../
     - sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' = '1' ]; then ./occ app:check-code $APP_NAME -c private -c strong-comparison; fi"
-    - sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' = '2' ]; then ./occ app:check-code $APP_NAME -c deprecation; fi"
+    - sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' = '1' ]; then ./occ app:check-code $APP_NAME -c deprecation; fi"
     - cd apps/$APP_NAME/
 
-    - sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' != '1' -a '$CODECHECK' != '2' ]; then php build/phpunit.phar -v -c phpunit.xml --coverage-clover=coverage.clover --coverage-php=phpunit; fi"
+    - sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' = '1' ]; then php build/phpunit.phar -v -c phpunit.xml --coverage-clover=coverage.clover --coverage-php=phpunit; fi"
 
 
     # Create coverage report
-    - sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' != '1' -a '$CODECHECK' != '2' ]; then php vendor/bin/codacycoverage -v clover coverage.clover; fi"
-    - sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' != '1' -a '$CODECHECK' != '2' ]; then php ocular.phar code-coverage:upload --access-token="$SCRUTINIZER_TOKEN" --format=php-clover coverage.clover; fi"
+    - sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' = '1' ]; then php vendor/bin/codacycoverage -v clover coverage.clover; fi"
+    - sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' = '1' ]; then php ocular.phar code-coverage:upload --access-token="$SCRUTINIZER_TOKEN" --format=php-clover coverage.clover; fi"
 
 
     -  sh -c "if [ '$JSTESTS' = '1' ]; then grunt jshint; fi"
@@ -92,22 +92,9 @@ matrix:
       env: DB=mysql;JSTESTS=1;
     - php: 7.0
       env: DB=mysql;CODECHECK=1
-    - php: 5.6
-      env: DB=mysql;CODECHECK=2
-    - php: 7.0
-      env: DB=mysql;CODECHECK=2
     - php: 7.0
       env: DB=sqlite;CLOUD=owncloud;SERVER_FOLDER=core
     - php: 7.0
       env: DB=mysql;CLOUD=owncloud;SERVER_FOLDER=core
-
-    - php: 5.6
-      env: DB=sqlite;CORE_BRANCH=stable11;
-    - php: 5.6
-      env: DB=mysql;CORE_BRANCH=stable11;
-    - php: 7.0
-      env: DB=sqlite;CORE_BRANCH=stable11;
-    - php: 7.0
-      env: DB=mysql;CORE_BRANCH=stable11;
   allow_failures:
     - env: DB=sqlite;CODECHECK=2