diff --git a/.travis.yml b/.travis.yml
index 8cf2a6a..2d68410 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,11 +5,20 @@
 ---
 sudo: false
 rvm:
-- 2.1.5
+- 2.3.1
 gemfile:
 - gemfiles/activerecord-4.2/Gemfile.mysql2
 - gemfiles/activerecord-4.2/Gemfile.postgresql
 - gemfiles/activerecord-4.2/Gemfile.sqlite3
+- gemfiles/activerecord-5.0/Gemfile.mysql2
+- gemfiles/activerecord-5.0/Gemfile.postgresql
+- gemfiles/activerecord-5.0/Gemfile.sqlite3
+- gemfiles/activerecord-5.1/Gemfile.mysql2
+- gemfiles/activerecord-5.1/Gemfile.postgresql
+- gemfiles/activerecord-5.1/Gemfile.sqlite3
+- gemfiles/activerecord-5.2/Gemfile.mysql2
+- gemfiles/activerecord-5.2/Gemfile.postgresql
+- gemfiles/activerecord-5.2/Gemfile.sqlite3
 env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
 addons:
   postgresql: '9.4'
diff --git a/README.md b/README.md
index 34b14b5..c871a45 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,10 @@ SchemaPlus::Tables is tested on:
 
 <!-- SCHEMA_DEV: MATRIX - begin -->
 <!-- These lines are auto-generated by schema_dev based on schema_dev.yml -->
-* ruby **2.1.5** with activerecord **4.2**, using **mysql2**, **sqlite3** or **postgresql**
+* ruby **2.3.1** with activerecord **4.2**, using **mysql2**, **sqlite3** or **postgresql**
+* ruby **2.3.1** with activerecord **5.0**, using **mysql2**, **sqlite3** or **postgresql**
+* ruby **2.3.1** with activerecord **5.1**, using **mysql2**, **sqlite3** or **postgresql**
+* ruby **2.3.1** with activerecord **5.2**, using **mysql2**, **sqlite3** or **postgresql**
 
 <!-- SCHEMA_DEV: MATRIX - end -->
 
diff --git a/gemfiles/activerecord-4.2/Gemfile.postgresql b/gemfiles/activerecord-4.2/Gemfile.postgresql
index 2c00e63..add48c4 100644
--- a/gemfiles/activerecord-4.2/Gemfile.postgresql
+++ b/gemfiles/activerecord-4.2/Gemfile.postgresql
@@ -2,9 +2,9 @@ require "pathname"
 eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
 
 platform :ruby do
-  gem "pg"
+  gem "pg", "< 1"
 end
 
 platform :jruby do
   gem 'activerecord-jdbcpostgresql-adapter'
-end
\ No newline at end of file
+end
diff --git a/gemfiles/activerecord-5.0/Gemfile.base b/gemfiles/activerecord-5.0/Gemfile.base
new file mode 100644
index 0000000..4db520c
--- /dev/null
+++ b/gemfiles/activerecord-5.0/Gemfile.base
@@ -0,0 +1,3 @@
+eval File.read File.expand_path('../../Gemfile.base', __FILE__)
+
+gem "activerecord", "~> 5.0.1"
diff --git a/gemfiles/activerecord-5.0/Gemfile.mysql2 b/gemfiles/activerecord-5.0/Gemfile.mysql2
new file mode 100644
index 0000000..f6e58e3
--- /dev/null
+++ b/gemfiles/activerecord-5.0/Gemfile.mysql2
@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "mysql2"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcmysql-adapter'
+end
diff --git a/gemfiles/activerecord-5.0/Gemfile.postgresql b/gemfiles/activerecord-5.0/Gemfile.postgresql
new file mode 100644
index 0000000..add48c4
--- /dev/null
+++ b/gemfiles/activerecord-5.0/Gemfile.postgresql
@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "pg", "< 1"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+end
diff --git a/gemfiles/activerecord-5.0/Gemfile.sqlite3 b/gemfiles/activerecord-5.0/Gemfile.sqlite3
new file mode 100644
index 0000000..a116d6d
--- /dev/null
+++ b/gemfiles/activerecord-5.0/Gemfile.sqlite3
@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "sqlite3"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
+end
\ No newline at end of file
diff --git a/gemfiles/activerecord-5.1/Gemfile.base b/gemfiles/activerecord-5.1/Gemfile.base
new file mode 100644
index 0000000..2ceae37
--- /dev/null
+++ b/gemfiles/activerecord-5.1/Gemfile.base
@@ -0,0 +1,3 @@
+eval File.read File.expand_path('../../Gemfile.base', __FILE__)
+
+gem "activerecord", "~> 5.1.0"
diff --git a/gemfiles/activerecord-5.1/Gemfile.mysql2 b/gemfiles/activerecord-5.1/Gemfile.mysql2
new file mode 100644
index 0000000..f6e58e3
--- /dev/null
+++ b/gemfiles/activerecord-5.1/Gemfile.mysql2
@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "mysql2"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcmysql-adapter'
+end
diff --git a/gemfiles/activerecord-5.1/Gemfile.postgresql b/gemfiles/activerecord-5.1/Gemfile.postgresql
new file mode 100644
index 0000000..add48c4
--- /dev/null
+++ b/gemfiles/activerecord-5.1/Gemfile.postgresql
@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "pg", "< 1"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+end
diff --git a/gemfiles/activerecord-5.1/Gemfile.sqlite3 b/gemfiles/activerecord-5.1/Gemfile.sqlite3
new file mode 100644
index 0000000..a116d6d
--- /dev/null
+++ b/gemfiles/activerecord-5.1/Gemfile.sqlite3
@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "sqlite3"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
+end
\ No newline at end of file
diff --git a/gemfiles/activerecord-5.2/Gemfile.base b/gemfiles/activerecord-5.2/Gemfile.base
new file mode 100644
index 0000000..efbdc60
--- /dev/null
+++ b/gemfiles/activerecord-5.2/Gemfile.base
@@ -0,0 +1,3 @@
+eval File.read File.expand_path('../../Gemfile.base', __FILE__)
+
+gem "activerecord", ">= 5.2.0.beta0", "< 5.3"
diff --git a/gemfiles/activerecord-5.2/Gemfile.mysql2 b/gemfiles/activerecord-5.2/Gemfile.mysql2
new file mode 100644
index 0000000..f6e58e3
--- /dev/null
+++ b/gemfiles/activerecord-5.2/Gemfile.mysql2
@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "mysql2"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcmysql-adapter'
+end
diff --git a/gemfiles/activerecord-5.2/Gemfile.postgresql b/gemfiles/activerecord-5.2/Gemfile.postgresql
new file mode 100644
index 0000000..d47da55
--- /dev/null
+++ b/gemfiles/activerecord-5.2/Gemfile.postgresql
@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "pg"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+end
diff --git a/gemfiles/activerecord-5.2/Gemfile.sqlite3 b/gemfiles/activerecord-5.2/Gemfile.sqlite3
new file mode 100644
index 0000000..a116d6d
--- /dev/null
+++ b/gemfiles/activerecord-5.2/Gemfile.sqlite3
@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "sqlite3"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
+end
\ No newline at end of file
diff --git a/schema_dev.yml b/schema_dev.yml
index da8c12b..f4672e6 100644
--- a/schema_dev.yml
+++ b/schema_dev.yml
@@ -1,7 +1,10 @@
 ruby:
-    - 2.1.5
+    - 2.3.1
 activerecord:
     - 4.2
+    - 5.0
+    - 5.1
+    - 5.2
 db:
     - mysql2
     - sqlite3
diff --git a/schema_plus_tables.gemspec b/schema_plus_tables.gemspec
index 4e2b3fb..6249e15 100644
--- a/schema_plus_tables.gemspec
+++ b/schema_plus_tables.gemspec
@@ -17,8 +17,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "activerecord", "~> 4.2"
-  gem.add_dependency "schema_plus_core", "~> 1.0"
+  gem.add_dependency "activerecord", ">= 4.2", "< 5.3"
+  gem.add_dependency "schema_plus_core"
 
   gem.add_development_dependency "bundler", "~> 1.7"
   gem.add_development_dependency "rake", "~> 10.0"