diff --git a/.travis.yml b/.travis.yml
index e98891068..776c69619 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,28 @@
 language: ruby
+
 rvm:
   - 2.0.0
-  - 2.1.2
+  - 2.1
+
+services:
+  - redis-server
+
+sudo: false
+
+cache: bundler
+
+env:
+  - DISCOURSE_HOSTNAME=www.example.com
+  - RUBY_GC_MALLOC_LIMIT=50000000
+
 before_install:
   - npm i -g jshint
   - jshint .
+
 before_script:
   - psql -c 'create database discourse_test;' -U postgres
-  - export DISCOURSE_HOSTNAME=www.example.com
-  - export RUBY_GC_MALLOC_LIMIT=50000000
-  - bundle exec rake db:migrate
-bundler_args: --without development
+  - bundle exec rake db:schema:load
+
+bundler_args: --without development --deployment
+
 script: 'bundle exec rspec && bundle exec rake plugin:spec && bundle exec rake qunit:test'
-services:
-  - redis-server