diff --git a/.travis.yml b/.travis.yml
index 0852d52..79d1fcb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@ rvm:
   # - rbx-3
 
 gemfile:
+  - gemfiles/active_record_60.gemfile
   - gemfiles/active_record_52.gemfile
   - gemfiles/active_record_51.gemfile
   - gemfiles/active_record_50.gemfile
@@ -46,12 +47,16 @@ matrix:
       gemfile: gemfiles/active_record_41.gemfile
     - rvm: 2.4.5
       gemfile: gemfiles/active_record_edge.gemfile
+    - rvm: 2.4.5
+      gemfile: gemfiles/active_record_60.gemfile
     - rvm: 2.4.5
       gemfile: gemfiles/active_record_42.gemfile
     - rvm: 2.4.5
       gemfile: gemfiles/active_record_41.gemfile
     - rvm: 2.3.8
       gemfile: gemfiles/active_record_edge.gemfile
+    - rvm: 2.3.8
+      gemfile: gemfiles/active_record_60.gemfile
     - rvm: ruby-head
       gemfile: gemfiles/active_record_42.gemfile
     - rvm: ruby-head
diff --git a/Rakefile b/Rakefile
index c53a74c..b242128 100644
--- a/Rakefile
+++ b/Rakefile
@@ -17,6 +17,7 @@ task default: "test:all"
 namespace :test do
   mappers = %w(
     active_record_edge
+    active_record_60
     active_record_52
     active_record_51
     active_record_50
diff --git a/gemfiles/active_record_60.gemfile b/gemfiles/active_record_60.gemfile
new file mode 100644
index 0000000..7fc7d67
--- /dev/null
+++ b/gemfiles/active_record_60.gemfile
@@ -0,0 +1,26 @@
+source 'https://rubygems.org'
+
+gem 'railties', '~> 6.0.0.rc1'
+gem 'activerecord', '~> 6.0.0.rc1', require: 'active_record'
+gem 'actionview', '~> 6.0.0.rc1', require: 'action_view'
+
+gem 'selenium-webdriver'
+
+platforms :ruby do
+  gem 'sqlite3', require: false
+  gem 'pg', require: false
+  gem 'mysql2', require: false
+end
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
+  gem 'activerecord-jdbcpostgresql-adapter', require: false
+  gem 'activerecord-jdbcmysql-adapter', require: false
+end
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'minitest'
+  gem 'rubinius-developer_tools'
+end
+
+gemspec path: '../'