diff --git a/.gitignore b/.gitignore
index 5cd235ddb..981a61ac7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,4 +62,7 @@ Desktop.ini
 
 .*.sw[a-z]
 *.un~
-Session.vim
\ No newline at end of file
+Session.vim
+
+/composer.lock
+/vendor
diff --git a/.travis.yml b/.travis.yml
index 949ffaa0d..334c4b200 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,13 +36,20 @@ services:
   - redis-server
   - memcached
 
+# cache vendor dirs
+cache:
+  directories:
+    - vendor
+    - $HOME/.composer/cache
+
 install:
   - travis_retry composer self-update && composer --version
+  - travis_retry composer update --prefer-dist --no-interaction
 
 before_script:
   - ./tests/travis/mysql-setup.sh
   - ./tests/travis/postgresql-setup.sh
   - ./tests/travis/memcache-setup.sh
-  - cd tests
 
-script: phpunit --verbose --colors --no-globals-backup --exclude-group mssql,oci framework
+script: cd tests && ../vendor/bin/phpunit --verbose --colors --no-globals-backup --exclude-group mssql,oci framework
+
diff --git a/composer.json b/composer.json
index f414ce383..e76e80f61 100644
--- a/composer.json
+++ b/composer.json
@@ -80,5 +80,9 @@
 			"framework/YiiBase.php",
 			"framework/yii.php"
 		]
+	},
+	"require-dev": {
+		"phpunit/phpunit": "~3.7",
+		"phpunit/phpunit-selenium": "~1.4.0"
 	}
 }