diff --git a/.travis.yml b/.travis.yml
index ba48a76..c956446 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,24 +9,37 @@ matrix:
       gemfile: gemfiles/Gemfile.rails-4.0
     - rvm: 1.9.3
       gemfile: gemfiles/Gemfile.rails-4.2
+
     - rvm: 2.0.0
       gemfile: gemfiles/Gemfile.rails-3.X
     - rvm: 2.0.0
       gemfile: gemfiles/Gemfile.rails-4.0
     - rvm: 2.0.0
       gemfile: gemfiles/Gemfile.rails-4.2
+
     - rvm: 2.1.0
       gemfile: gemfiles/Gemfile.rails-3.X
     - rvm: 2.1.0
       gemfile: gemfiles/Gemfile.rails-4.0
     - rvm: 2.1.0
       gemfile: gemfiles/Gemfile.rails-4.2
+
+    - rvm: 2.2.2
+      gemfile: gemfiles/Gemfile.rails-3.X
+    - rvm: 2.2.2
+      gemfile: gemfiles/Gemfile.rails-4.0
     - rvm: 2.2.2
       gemfile: gemfiles/Gemfile.rails-4.2
+    - rvm: 2.2.2
+      gemfile: gemfiles/Gemfile.rails-5.0
+    - rvm: 2.3.0
+      gemfile: gemfiles/Gemfile.rails-3.X
     - rvm: 2.3.1
       gemfile: gemfiles/Gemfile.rails-4.0
     - rvm: 2.3.1
       gemfile: gemfiles/Gemfile.rails-4.2
+    - rvm: 2.3.0
+      gemfile: gemfiles/Gemfile.rails-5.0
 
   fast_finish: true
   allow_failures:
diff --git a/bin/run_tests.sh b/bin/run_tests.sh
index 4e58ac0..b8d8e0b 100755
--- a/bin/run_tests.sh
+++ b/bin/run_tests.sh
@@ -1,9 +1,8 @@
 #!/bin/sh
 
-for i in 3.X 4.0 4.2; do
+for i in 3.X 4.0 4.2 5.0; do
     echo "Testing active_record $i:"
     rm -f Gemfile.lock
-    rm -f gemfiles/Gemfile.rails-$i.lock
     BUNDLE_GEMFILE=gemfiles/Gemfile.rails-$i bundle > /dev/null
     BUNDLE_GEMFILE=gemfiles/Gemfile.rails-$i bundle exec rake
 done
diff --git a/gemfiles/Gemfile.rails-5.0 b/gemfiles/Gemfile.rails-5.0
new file mode 100644
index 0000000..c16d545
--- /dev/null
+++ b/gemfiles/Gemfile.rails-5.0
@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+gemspec path: '..'
+
+gem 'rake', '< 11.0'
+gem 'actionpack', '~> 5.0.0'
+gem 'railties', '~> 5.0.0'
+gem 'activerecord', '~> 5.0.0'
+gem 'simplecov', :require => false, :group => :test
\ No newline at end of file