diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 40158b4..743f7a0 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -2,7 +2,34 @@ imports:
     - php
 
 filter:
-    excluded_paths: [test/*]
+    paths: [*.php, webroot/img.php] 
 
 tools:
-    external_code_coverage: true
+   # Copy/Paste Detector                              
+   php_cpd: true                                      
+                                                      
+   # Metrics                                          
+   php_pdepend: true                                  
+                                                      
+   # Some Metrics + Bug Detection/Auto-Fixes          
+   php_analyzer: true                                 
+                                                      
+   php_code_sniffer:                                  
+       config:                                        
+           standard: "PSR2"                           
+                                                      
+   php_sim:                                           
+       min_mass: 16 # Defaults to 16                  
+                                                      
+   php_mess_detector:                                 
+       #config:                                       
+       #    ruleset: ../your-phpmd-ruleset/ruleset.xml
+       
+build:
+    tests:
+        override:
+            -
+                command: 'phpunit'
+                coverage:
+                    file: 'coverage.clover'
+                    format: 'php-clover'
diff --git a/.travis.yml b/.travis.yml
index 89f2ce4..a137754 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,15 @@
 language: php
 php:
-    - 5.6
-    - 5.5
     - 5.4
+    - 5.5
+    - 5.6
+    - 5.7
+    - 6.0
     - hhvm
-
-before_script:
-    - wget https://scrutinizer-ci.com/ocular.phar
+    - nightly
 
 script:
     - phpunit
 
-after_script:
-    - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
-    
 notifications:
     irc: "irc.freenode.org#dbwebb"
diff --git a/REVISION.md b/REVISION.md
index 954daa7..4a6e9d2 100644
--- a/REVISION.md
+++ b/REVISION.md
@@ -5,6 +5,7 @@ Revision history
 v0.7.0.x (latest)
 -------------------------------------
 
+* Improving usage of Travis and Scrutinizer.
 * Naming cache-file using md5 for remote images, fix #86.
 * Loading images without depending on filename extension, fix #85.
 * Adding unittest with phpunit #84, fix #13