diff --git a/.travis.yml b/.travis.yml
index fa236d1..8853fc1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,14 @@ sudo: false
 language: ruby
 cache: bundler
 
+before_install:
+  - rvm list
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v '1.16.1'
+  - bundle _1.16.1_ install
+
 rvm:
-  - 2.4.0
+  - 2.3.0
   - 2.5.0
   - jruby-9.1.12.0
 
@@ -16,7 +22,6 @@ addons:
 
 gemfile:
   - gemfiles/rails_3.2.gemfile
-  - gemfiles/rails_4.0.gemfile
   - gemfiles/rails_4.2.gemfile
   - gemfiles/rails_4.2_mongoid_5.gemfile
   - gemfiles/rails_4.2_nobrainer.gemfile
@@ -36,6 +41,20 @@ script:
 
 matrix:
   exclude:
+    - rvm: 2.3.0
+      gemfile: gemfiles/rails_5.0.gemfile
+    - rvm: 2.3.0
+      gemfile: gemfiles/rails_5.0_nobrainer.gemfile
+    - rvm: 2.3.0
+      gemfile: gemfiles/rails_5.1.gemfile
+    - rvm: 2.5.0
+      gemfile: gemfiles/rails_3.2.gemfile
+    - rvm: 2.5.0
+      gemfile: gemfiles/rails_4.2.gemfile
+    - rvm: 2.5.0
+      gemfile: gemfiles/rails_4.2_mongoid_5.gemfile
+    - rvm: 2.5.0
+      gemfile: gemfiles/rails_4.2_nobrainer.gemfile
     - rvm: jruby-9.1.12.0
       gemfile: gemfiles/rails_5.0.gemfile
     - rvm: jruby-9.1.12.0
diff --git a/Appraisals b/Appraisals
index 72ed0f2..e67ed3c 100644
--- a/Appraisals
+++ b/Appraisals
@@ -4,17 +4,7 @@ appraise 'rails_3.2' do
   gem 'sequel'
   gem 'bson_ext', platforms: :ruby
   gem 'test-unit', '~> 3.0'
-  gem 'activerecord-jdbcsqlite3-adapter', '1.3.24', platforms: :jruby
-end
-
-appraise 'rails_4.0' do
-  gem 'mime-types', '~> 2', platforms: %i[ruby_19 jruby]
-  gem 'rails', '4.0.13'
-  gem 'mongoid', '~> 4.0'
-  gem 'sequel'
-  gem 'dynamoid', '~> 1', platforms: :ruby
-  gem 'aws-sdk', '~> 2', platforms: :ruby
-  gem 'redis-objects'
+  gem 'minitest'
   gem 'activerecord-jdbcsqlite3-adapter', '1.3.24', platforms: :jruby
 end
 
diff --git a/Dockerfile b/Dockerfile
index ec5a630..7dd0576 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,9 @@
-FROM ruby:2.3.4-slim
+ARG RVM_RUBY_VERSIONS="2.4.0 2.5.0"
+ARG RVM_RUBY_DEFAULT="2.4.0"
+FROM msati/docker-rvm
+
+# After Ruby versions are installed we continue as non-root rvm user
+USER ${RVM_USER}
 
 LABEL maintainer="AASM"
 
diff --git a/gemfiles/rails_3.2.gemfile b/gemfiles/rails_3.2.gemfile
index 1198e6b..0a1bba6 100644
--- a/gemfiles/rails_3.2.gemfile
+++ b/gemfiles/rails_3.2.gemfile
@@ -8,6 +8,7 @@ gem "mongoid", "~> 3.1"
 gem "sequel"
 gem "bson_ext", platforms: :ruby
 gem "test-unit", "~> 3.0"
+gem "minitest"
 gem "activerecord-jdbcsqlite3-adapter", "1.3.24", platforms: :jruby
 
 gemspec path: "../"
diff --git a/gemfiles/rails_4.0.gemfile b/gemfiles/rails_4.0.gemfile
deleted file mode 100644
index 26a7f62..0000000
--- a/gemfiles/rails_4.0.gemfile
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "sqlite3", "~> 1.3.5", platforms: :ruby
-gem "rails", "4.0.13"
-gem "mime-types", "~> 2", platforms: [:ruby_19, :jruby]
-gem "mongoid", "~> 4.0"
-gem "sequel"
-gem "dynamoid", "~> 1", platforms: :ruby
-gem "aws-sdk", "~> 2", platforms: :ruby
-gem "redis-objects"
-gem "activerecord-jdbcsqlite3-adapter", "1.3.24", platforms: :jruby
-
-gemspec path: "../"