diff --git a/.travis.yml b/.travis.yml
index 14e94869..04367945 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,5 +8,11 @@ php:
   - 5.3
   - hhvm
   - nightly
+
+install:
+  - travis_retry composer update --no-progress --prefer-dist --profile
+
+script:
+  - composer test
   
 sudo: false
diff --git a/composer.json b/composer.json
index 7724e3f2..ed40b8b5 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,17 @@
 		}
 	],
 	"require": {
-		"PHP" : ">=5.3"
+		"PHP" : ">=5.3",
+		"squizlabs/php_codesniffer": "2.3.4"
+	},
+	"require-dev": {
+		"jakub-onderka/php-parallel-lint": "0.9.*"
+	},
+	"scripts": {
+		"test": [
+			"parallel-lint . --exclude vendor",
+			"phpcs --standard= --extensions=php,php5,inc --ignore=vendor,*fail.php -p ."
+		]
 	},
 	"autoload": {
 		"psr-0": { "Less": "lib/" },