diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 807ccb36a..ef5619384 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -1,11 +1,15 @@
 filter:
-        paths: [library/*]
+    excluded_paths:
+        - tests/*
+
+checks:
+    php:
+        code_rating: true
+
 tools:
-    external_code_coverage:
-        runs: 4
-    php_cpd:
-        excluded_dirs: [vendor]
-    php_pdepend:
-        excluded_dirs: [vendor]
-    sensiolabs_security_checker: true
+    php_analyzer: true
     php_changetracking: true
+    php_cpd: true
+    php_mess_detector: true
+    php_pdepend: true
+    sensiolabs_security_checker: true
diff --git a/.travis.yml b/.travis.yml
index 21322db68..599e9aede 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,5 @@
-# a Courtesy of Respect/Foundation
-
-language: php
-
-env: FOUNDATION_NO_WAIT=1
+language:
+  php
 
 php:
   - 5.3
@@ -12,12 +9,11 @@ php:
   - hhvm
 
 before_script:
-  - make composer-install-dev
+  - composer install --dev --no-interaction --prefer-source
   - phpenv rehash
 
 script:
-  - make testdox
-  - make scrutinizer-coverage
+  - vendor/bin/phpunit --configuration tests/phpunit.xml --testdox tests/
 
 matrix:
   allow_failures: