diff --git a/.travis.yml b/.travis.yml
index 4367761..a64e2c0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,17 +4,18 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - 7.0
   - hhvm
 
 before_script:
   - travis_retry composer self-update
-  - travis_retry composer require satooshi/php-coveralls:dev-master --no-update
   - travis_retry composer install --no-interaction --prefer-source
 
-script: 
+script:
   - mkdir -p build/logs
+  - ./vendor/bin/parallel-lint src test
   - ./vendor/bin/phpunit --coverage-text
-  - ./vendor/bin/phpcs src --standard=psr2
+  - ./vendor/bin/phpcs src --standard=psr2 -sp
 
 after_script:
   - php vendor/bin/coveralls
diff --git a/composer.json b/composer.json
index c7bf059..40165b7 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,9 @@
     "require-dev": {
         "phpunit/phpunit": "~4.0",
         "mockery/mockery": "~0.9",
-        "squizlabs/php_codesniffer": "~2.0"
+        "squizlabs/php_codesniffer": "~2.0",
+        "satooshi/php-coveralls": "0.6.*",
+        "jakub-onderka/php-parallel-lint": "0.8.*"
     },
     "keywords": [
         "oauth",