diff --git a/.travis.yml b/.travis.yml
index db89bc3..afc0fb3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: ruby
 before_script:
   - cd tests/test_app
   - bundle exec rails g impressionist -f
-  - bundle exec rake db:migrate
+  - bundle exec rake db:create db:migrate RAILS_ENV=test
   - cd ..
 rvm:
   - 1.9.3
diff --git a/gemfiles/rails32.gemfile b/gemfiles/rails32.gemfile
index 08a2fae..35d20f1 100644
--- a/gemfiles/rails32.gemfile
+++ b/gemfiles/rails32.gemfile
@@ -22,6 +22,9 @@ group :test do
   gem 'simplecov'
   gem 'systemu'
   gem 'friendly_id', '~> 4.0.9'
+
+  # test/unit has been removed by default in Ruby 2.2.x+
+  gem 'test-unit'
 end
 
 gemspec :path => '../'
diff --git a/gemfiles/rails40.gemfile b/gemfiles/rails40.gemfile
index beb41c9..18557d2 100644
--- a/gemfiles/rails40.gemfile
+++ b/gemfiles/rails40.gemfile
@@ -22,6 +22,9 @@ group :test do
   gem 'simplecov'
   gem 'systemu'
   gem 'friendly_id', '~> 5.1.0'
+
+  # test/unit has been removed by default in Ruby 2.2.x+
+  gem 'test-unit'
 end
 
 gemspec :path => '../'