diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 15d5e847..048faab3 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -12,7 +12,7 @@ imports:
 tools:
     external_code_coverage: true
     external_code_coverage:
-        timeout: 600 # Timeout in seconds: 10 min
+        timeout: 7200 # Timeout in seconds: 2 hours
     php_mess_detector: true
     php_code_sniffer: true
     sensiolabs_security_checker: true
diff --git a/.travis.yml b/.travis.yml
index 2a93ffde..e6f06c97 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -66,10 +66,8 @@ script:
 
 
     # Create coverage report
-    - sh -c "if [ -z "${CODACY_PROJECT_TOKEN+xxx}" ]; then echo 'Codacy token is not set'; fi"
-    - sh -c "if [ -z "${CODACY_PROJECT_TOKEN}" -a '$JSTESTS' != '1' -a '$CODECHECK' = '1' ]; then php vendor/bin/codacycoverage -v clover coverage.clover; fi"
-    - sh -c "if [ -z "${SCRUTINIZER_TOKEN+xxx}" ]; then echo 'Scrutinizer token is not set'; fi"
-    - sh -c "if [ -z "${SCRUTINIZER_TOKEN}" -a '$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' -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"