diff --git a/.travis.yml b/.travis.yml
index ad8756158e7e3c9273cd261e198c6cfe8bcdf70c..2fb9413befacd6e49bfb0e5b30191e321ce7e105 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,12 @@
 ---
 language: ruby
 sudo: false
-cache: bundler
+cache:
+  directories:
+    - vendor/bundle
+    - spec/fixtures/modules
 bundler_args: --without system_tests
-script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec fakeroot rake spec SPEC_OPTS='--format documentation'", "bundle exec rake metadata"]
+script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec rake spec_prep", "bundle exec fakeroot rake spec_standalone SPEC_OPTS='--format documentation'", "bundle exec rake metadata"]
 matrix:
   fast_finish: true
   include: