diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 5563f4510..df6d207ec 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -5,8 +5,6 @@ tools:
     php_code_coverage:
         enabled: true
         test_command: phpunit -c phpunit.xml.dist --exclude-group Functional,Performance
-        #filter:
-            #paths: ["src"]
     php_code_sniffer:
         enabled: true
         config:
@@ -28,14 +26,19 @@ tools:
     php_mess_detector:
         enabled: true
         config:
+            ruleset: phpmd.xml.dist
             design_rules: { eval_expression: false }
         filter:
             paths: ["src/*"]
     php_pdepend:
         enabled: true
         excluded_dirs: ["build", "docs", "examples", "tests", "vendor"]
-    php_analyzer: true
     php_analyzer:
+        enabled: true
+        filter:
+            paths: ["src/*", "tests/*", "examples/*"]
+    php_hhvm:
+        enabled: true
         filter:
             paths: ["src/*", "tests/*", "examples/*"]
     sensiolabs_security_checker: true