diff --git a/.gitignore b/.gitignore
index f61f58b8..838a74e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 *.swp
+.ruby-version
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 49262de1..d54edc2c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,4 @@ matrix:
   allow_failures:
     - rvm: ruby-head
     - env: "RAILS_VERSION=master"
-    - env: "RAILS_VERSION=4.0"
     - env: "RAILS_VERSION=3.2"
-
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 3fd3776c..b7875f75 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -5,6 +5,8 @@ require 'action_controller'
 require 'action_controller/test_case'
 require "active_support/json"
 require 'minitest/autorun'
+# Ensure backward compatibility with Minitest 4
+Minitest::Test = MiniTest::Unit::TestCase unless defined?(Minitest::Test)
 
 require "active_model_serializers"