diff --git a/lib/tasks/rails4.rake b/lib/tasks/rails4.rake
deleted file mode 100644
index 70320e7..0000000
--- a/lib/tasks/rails4.rake
+++ /dev/null
@@ -1,6 +0,0 @@
-if defined?(RSpec)
-  namespace :rails4 do
-    RSpec::Core::RakeTask.new(:spec)
-    task test: %w(spec:prepare_db spec)
-  end
-end
diff --git a/lib/tasks/tests.rake b/lib/tasks/tests.rake
index ad8e0cb..18f001c 100644
--- a/lib/tasks/tests.rake
+++ b/lib/tasks/tests.rake
@@ -3,6 +3,6 @@ if defined?(RSpec)
     task prepare_db: %w(db:create db:test:load)
 
     desc "Prepare for rspec"
-    task prepare: %w(db:environment:set prepare_db)
+    task prepare: Rails::VERSION::MAJOR == 5 ? %w(db:environment:set prepare_db) : %w(prepare_db)
   end
 end
diff --git a/test/scripts/travis.sh b/test/scripts/travis.sh
index 0a75aff..8768367 100755
--- a/test/scripts/travis.sh
+++ b/test/scripts/travis.sh
@@ -5,7 +5,7 @@ set -x
 if [[ ${TRAVIS_RUBY_VERSION} == "2.1" ]]; then
   # ruby 2.1
   export NO_COVERAGE="true" # No coverage for rails 4, because controller specs are disabled
-  bundle exec rake rails4:test --trace
+  bundle exec rake --trace
 else
   # ruby >= 2.2
   bundle exec rake --trace