diff --git a/.travis.yml b/.travis.yml
index 3a7a2235..d2a68a90 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,4 +37,9 @@ script:
   - bash -x ./test/ci/redmine_install.sh -c
   - bash -x ./test/ci/redmine_install.sh -i
   - bash -x ./test/ci/redmine_install.sh -t
-  - bash -x ./test/ci/redmine_install.sh -u
\ No newline at end of file
+  - bash -x ./test/ci/redmine_install.sh -u
+
+env:
+  - RAILS_ENV=test
+
+cache: bundler
\ No newline at end of file
diff --git a/test/ci/redmine_install.sh b/test/ci/redmine_install.sh
index 7b8ed0a5..8aeb21f1 100644
--- a/test/ci/redmine_install.sh
+++ b/test/ci/redmine_install.sh
@@ -44,9 +44,9 @@ test()
   #bundle exec rake tmp:create
 
   # Run tests within application
-  bundle exec rake redmine:plugins:test:units NAME=redmine_dmsf RAILS_ENV=test
-  bundle exec rake redmine:plugins:test:functionals NAME=redmine_dmsf RAILS_ENV=test
-  bundle exec rake redmine:plugins:test:integration NAME=redmine_dmsf RAILS_ENV=test
+  bundle exec rake redmine:plugins:test:units NAME=redmine_dmsf
+  bundle exec rake redmine:plugins:test:functionals NAME=redmine_dmsf
+  bundle exec rake redmine:plugins:test:integration NAME=redmine_dmsf
 }
 
 uninstall()
@@ -57,7 +57,7 @@ uninstall()
   cd $PATH_TO_REDMINE
 
   # clean up database
-  bundle exec rake redmine:plugins:migrate NAME=redmine_dmsf VERSION=0 RAILS_ENV=test
+  bundle exec rake redmine:plugins:migrate NAME=redmine_dmsf VERSION=0
 }
 
 install()
@@ -82,16 +82,16 @@ install()
   bundle install --path vendor/bundle --without xapian rmagick development
 
   # Run Redmine database migrations
-  bundle exec rake db:migrate RAILS_ENV=test --trace  
+  bundle exec rake db:migrate --trace
 
   # Load Redmine database default data  
-  bundle exec rake redmine:load_default_data REDMINE_LANG=en RAILS_ENV=test
+  bundle exec rake redmine:load_default_data REDMINE_LANG=en
 
   # generate session store/secret token
-  bundle exec rake generate_secret_token RAILS_ENV=test
+  bundle exec rake generate_secret_token
   
   # Run the plugin database migrations
-  bundle exec rake redmine:plugins:migrate RAILS_ENV=test
+  bundle exec rake redmine:plugins:migrate
 }
 
 while getopts :ictu opt