diff --git a/.travis.yml b/.travis.yml
index 423d588..230ee1b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,17 +12,10 @@ gemfile:
   - gemfiles/rails_5.0.gemfile
   - gemfiles/rails_5.1.gemfile
   - gemfiles/rails_5.2.gemfile
+  - gemfiles/mongoid_4.0.gemfile
+  - gemfiles/mongoid_5.0.gemfile
+  - gemfiles/mongoid_6.0.gemfile
 
-# matrix:
-#   exclude:
-#     # Rails 5.0 only works with Ruby >= 2.2
-#     - rvm: 1.9.3
-#       gemfile: gemfiles/rails_5.0.gemfile
-#     - rvm: 2.0.0
-#       gemfile: gemfiles/rails_5.0.gemfile
-#     - rvm: 2.1
-#       gemfile: gemfiles/rails_5.0.gemfile
-#
 addons:
   code_climate:
     repo_token: b84a33c35c698270ad54261655bc25161a0853386825a2d54fb1c7a11c2b2785
diff --git a/Appraisals b/Appraisals
index 1527d9c..b243104 100644
--- a/Appraisals
+++ b/Appraisals
@@ -18,32 +18,31 @@ appraise 'rails-5.2' do
   gem 'rails', '>= 5.2.0', '< 5.3'
 end
 
-appraise 'mongoid-3.0' do
-  gem 'mongoid', '~> 3.0.0'
-end
-
-appraise 'mongoid-3.1' do
-  gem 'mongoid', '~> 3.1.0'
-  gem 'json',  '~> 1.8', :platforms => :ruby_19 # Json 2.0 requires Ruby >= 2.0
-end
-
 appraise 'mongoid-4.0' do
   gem 'mongoid', '~> 4.0.0'
 end
 
-appraise 'mongo_mapper' do
-  gem 'mongo_mapper'
+appraise 'mongoid-5.0' do
+  gem 'mongoid', '~> 5.0.0'
 end
 
-appraise 'ripple' do
-  gem 'tzinfo'
-  gem 'ripple'
+appraise 'mongoid-6.0' do
+  gem 'mongoid', '~> 6.0.0'
 end
 
-appraise 'nobrainer' do
-  gem 'nobrainer'
-
-  # When activesupport 5 was released, it required ruby 2.2.2 as a minimum.
-  # Locking this down to 4.2.6 allows our Ruby 1.9 tests to keep working.
-  gem 'activesupport', '4.2.6', :platforms => :ruby_19
-end
+# appraise 'mongo_mapper' do
+#   gem 'mongo_mapper'
+# end
+#
+# appraise 'ripple' do
+#   gem 'tzinfo'
+#   gem 'ripple'
+# end
+#
+# appraise 'nobrainer' do
+#   gem 'nobrainer'
+#
+#   # When activesupport 5 was released, it required ruby 2.2.2 as a minimum.
+#   # Locking this down to 4.2.6 allows our Ruby 1.9 tests to keep working.
+#   gem 'activesupport', '4.2.6', :platforms => :ruby_19
+# end
diff --git a/gemfiles/mongoid_3.1.gemfile b/gemfiles/mongoid_3.1.gemfile
deleted file mode 100644
index 9a16e1b..0000000
--- a/gemfiles/mongoid_3.1.gemfile
+++ /dev/null
@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "mongoid", "~> 3.1.0"
-gem "json", "~> 1.8", platforms: :ruby_19
-
-gemspec path: "../"
diff --git a/gemfiles/mongo_mapper.gemfile b/gemfiles/mongoid_5.0.gemfile
similarity index 77%
rename from gemfiles/mongo_mapper.gemfile
rename to gemfiles/mongoid_5.0.gemfile
index 0520381..4404aeb 100644
--- a/gemfiles/mongo_mapper.gemfile
+++ b/gemfiles/mongoid_5.0.gemfile
@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "mongo_mapper"
+gem "mongoid", "~> 5.0.0"
 
 gemspec path: "../"
diff --git a/gemfiles/mongoid_3.0.gemfile b/gemfiles/mongoid_6.0.gemfile
similarity index 77%
rename from gemfiles/mongoid_3.0.gemfile
rename to gemfiles/mongoid_6.0.gemfile
index 934b14e..dc461ad 100644
--- a/gemfiles/mongoid_3.0.gemfile
+++ b/gemfiles/mongoid_6.0.gemfile
@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "mongoid", "~> 3.0.0"
+gem "mongoid", "~> 6.0.0"
 
 gemspec path: "../"
diff --git a/gemfiles/nobrainer.gemfile b/gemfiles/nobrainer.gemfile
deleted file mode 100644
index bb1dc7a..0000000
--- a/gemfiles/nobrainer.gemfile
+++ /dev/null
@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "nobrainer"
-gem "activesupport", "4.2.6", platforms: :ruby_19
-
-gemspec path: "../"
diff --git a/gemfiles/ripple.gemfile b/gemfiles/ripple.gemfile
deleted file mode 100644
index a0a83ca..0000000
--- a/gemfiles/ripple.gemfile
+++ /dev/null
@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "tzinfo"
-gem "ripple"
-
-gemspec path: "../"