diff --git a/Appraisals b/Appraisals
index bbad0b1..7fd30f3 100644
--- a/Appraisals
+++ b/Appraisals
@@ -1,19 +1,23 @@
-appraise 'rails-3-zeus-0.15' do
-  gem 'rails', '3.2.21'
-  gem 'zeus', '0.15.4'
+appraise 'rails-4-zeus-0.15' do
+  gem 'rails', '~> 4.2.3'
+  gem 'zeus', '~> 0.15.4'
+  gem 'ruby_dep', '< 1.4.0' # 1.4 and up require Ruby 2.2.5
+  gem 'listen', '< 3.1.0' # 3.1 and up require Ruby 2.2.3
 end
 
-appraise 'rails-4-zeus-0.15' do
-  gem 'rails', '4.2.3'
-  gem 'zeus', '0.15.4'
+appraise 'rails-4-zeus-0.13' do
+  gem 'rails', '~> 4.2.3'
+  gem 'zeus', '~> 0.13.3'
+  gem 'ruby_dep', '< 1.4.0' # 1.4 and up require Ruby 2.2.5
+  gem 'listen', '< 3.1.0' # 3.1 and up require Ruby 2.2.3
 end
 
-appraise 'rails-3-zeus-0.13' do
-  gem 'rails', '3.2.21'
-  gem 'zeus', '0.13.3'
+appraise 'rails-5-zeus-0.15' do
+  gem 'rails', '~> 5.0.0.1'
+  gem 'zeus', '~> 0.15.4'
 end
 
-appraise 'rails-4-zeus-0.13' do
-  gem 'rails', '4.2.3'
-  gem 'zeus', '0.13.3'
+appraise 'rails-5-zeus-0.13' do
+  gem 'rails', '~> 5.0.0.1'
+  gem 'zeus', '~> 0.13.3'
 end
diff --git a/circle.yml b/circle.yml
index ad2bb7f..b57fcbf 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,39 +1,32 @@
 dependencies:
   pre:
     - echo rvm_autoupdate_flag=0 >> ~/.rvmrc
+    - rvm install 2.3
     - rvm install 2.2
     - rvm install 2.1
-    - rvm install 2.0
-    - rvm install 1.9
 
   cache_directories:
+    - /home/ubuntu/.rvm/gems/ruby-2.3.0
     - /home/ubuntu/.rvm/gems/ruby-2.2.0
     - /home/ubuntu/.rvm/gems/ruby-2.1.5
-    - /home/ubuntu/.rvm/gems/ruby-2.0.0-p598
-    - /home/ubuntu/.rvm/gems/ruby-1.9.3-p551
 
   override:
-    - rvm-exec 2.2 bash -c 'bundle check --gemfile=gemfiles/rails_3_zeus_0.15.gemfile || bundle install --gemfile=gemfiles/rails_3_zeus_0.15.gemfile'
+    - rvm-exec 2.3 bash -c 'bundle check --gemfile=gemfiles/rails_5_zeus_0.15.gemfile || bundle install --gemfile=gemfiles/rails_5_zeus_0.15.gemfile'
+    - rvm-exec 2.3 bash -c 'bundle check --gemfile=gemfiles/rails_4_zeus_0.15.gemfile || bundle install --gemfile=gemfiles/rails_4_zeus_0.15.gemfile'
+    - rvm-exec 2.3 bash -c 'bundle check --gemfile=gemfiles/rails_5_zeus_0.13.gemfile || bundle install --gemfile=gemfiles/rails_5_zeus_0.13.gemfile'
+    - rvm-exec 2.3 bash -c 'bundle check --gemfile=gemfiles/rails_4_zeus_0.13.gemfile || bundle install --gemfile=gemfiles/rails_4_zeus_0.13.gemfile'
+    - rvm-exec 2.2 bash -c 'bundle check --gemfile=gemfiles/rails_5_zeus_0.15.gemfile || bundle install --gemfile=gemfiles/rails_5_zeus_0.15.gemfile'
     - rvm-exec 2.2 bash -c 'bundle check --gemfile=gemfiles/rails_4_zeus_0.15.gemfile || bundle install --gemfile=gemfiles/rails_4_zeus_0.15.gemfile'
-    - rvm-exec 2.2 bash -c 'bundle check --gemfile=gemfiles/rails_3_zeus_0.13.gemfile || bundle install --gemfile=gemfiles/rails_3_zeus_0.13.gemfile'
+    - rvm-exec 2.2 bash -c 'bundle check --gemfile=gemfiles/rails_5_zeus_0.13.gemfile || bundle install --gemfile=gemfiles/rails_5_zeus_0.13.gemfile'
     - rvm-exec 2.2 bash -c 'bundle check --gemfile=gemfiles/rails_4_zeus_0.13.gemfile || bundle install --gemfile=gemfiles/rails_4_zeus_0.13.gemfile'
-    - rvm-exec 2.1 bash -c 'bundle check --gemfile=gemfiles/rails_3_zeus_0.15.gemfile || bundle install --gemfile=gemfiles/rails_3_zeus_0.15.gemfile'
     - rvm-exec 2.1 bash -c 'bundle check --gemfile=gemfiles/rails_4_zeus_0.15.gemfile || bundle install --gemfile=gemfiles/rails_4_zeus_0.15.gemfile'
-    - rvm-exec 2.1 bash -c 'bundle check --gemfile=gemfiles/rails_3_zeus_0.13.gemfile || bundle install --gemfile=gemfiles/rails_3_zeus_0.13.gemfile'
     - rvm-exec 2.1 bash -c 'bundle check --gemfile=gemfiles/rails_4_zeus_0.13.gemfile || bundle install --gemfile=gemfiles/rails_4_zeus_0.13.gemfile'
-    - rvm-exec 2.0 bash -c 'bundle check --gemfile=gemfiles/rails_3_zeus_0.15.gemfile || bundle install --gemfile=gemfiles/rails_3_zeus_0.15.gemfile'
-    - rvm-exec 2.0 bash -c 'bundle check --gemfile=gemfiles/rails_4_zeus_0.15.gemfile || bundle install --gemfile=gemfiles/rails_4_zeus_0.15.gemfile'
-    - rvm-exec 2.0 bash -c 'bundle check --gemfile=gemfiles/rails_3_zeus_0.13.gemfile || bundle install --gemfile=gemfiles/rails_3_zeus_0.13.gemfile'
-    - rvm-exec 2.0 bash -c 'bundle check --gemfile=gemfiles/rails_4_zeus_0.13.gemfile || bundle install --gemfile=gemfiles/rails_4_zeus_0.13.gemfile'
-    - rvm-exec 1.9 bash -c 'bundle check --gemfile=gemfiles/rails_3_zeus_0.15.gemfile || bundle install --gemfile=gemfiles/rails_3_zeus_0.15.gemfile'
-    - rvm-exec 1.9 bash -c 'bundle check --gemfile=gemfiles/rails_4_zeus_0.15.gemfile || bundle install --gemfile=gemfiles/rails_4_zeus_0.15.gemfile'
-    - rvm-exec 1.9 bash -c 'bundle check --gemfile=gemfiles/rails_3_zeus_0.13.gemfile || bundle install --gemfile=gemfiles/rails_3_zeus_0.13.gemfile'
-    - rvm-exec 1.9 bash -c 'bundle check --gemfile=gemfiles/rails_4_zeus_0.13.gemfile || bundle install --gemfile=gemfiles/rails_4_zeus_0.13.gemfile'
 
 test:
   override:
+    - rvm-exec 2.3 bash -c 'bundle exec appraisal rspec'
     - rvm-exec 2.2 bash -c 'bundle exec appraisal rspec'
-    - rvm-exec 2.1 bash -c 'bundle exec appraisal rspec'
-    - rvm-exec 2.0 bash -c 'bundle exec appraisal rspec'
-    - rvm-exec 1.9 bash -c 'bundle exec appraisal rspec'
-    - rvm-exec 2.2 bash -c 'bundle exec rubocop'
+      # Rails 5 requires Ruby 2.2.2
+    - rvm-exec 2.1 bash -c 'bundle exec appraisal rails4-zeus-0.15 rspec'
+    - rvm-exec 2.1 bash -c 'bundle exec appraisal rails4-zeus-0.13 rspec'
+    - rvm-exec 2.3 bash -c 'bundle exec rubocop'
diff --git a/gemfiles/rails_4_zeus_0.13.gemfile b/gemfiles/rails_4_zeus_0.13.gemfile
index 42da9b5..848ac56 100644
--- a/gemfiles/rails_4_zeus_0.13.gemfile
+++ b/gemfiles/rails_4_zeus_0.13.gemfile
@@ -2,7 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "rails", "4.2.3"
-gem "zeus", "0.13.3"
+gem "rails", "~> 4.2.3"
+gem "zeus", "~> 0.13.3"
+gem "ruby_dep", "< 1.4.0"
+gem "listen", "< 3.1.0"
 
 gemspec :path => "../"
diff --git a/gemfiles/rails_4_zeus_0.15.gemfile b/gemfiles/rails_4_zeus_0.15.gemfile
index 7729cc2..bd24ca3 100644
--- a/gemfiles/rails_4_zeus_0.15.gemfile
+++ b/gemfiles/rails_4_zeus_0.15.gemfile
@@ -2,7 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "rails", "4.2.3"
-gem "zeus", "0.15.4"
+gem "rails", "~> 4.2.3"
+gem "zeus", "~> 0.15.4"
+gem "ruby_dep", "< 1.4.0"
+gem "listen", "< 3.1.0"
 
 gemspec :path => "../"
diff --git a/gemfiles/rails_3_zeus_0.13.gemfile b/gemfiles/rails_5_zeus_0.13.gemfile
similarity index 65%
rename from gemfiles/rails_3_zeus_0.13.gemfile
rename to gemfiles/rails_5_zeus_0.13.gemfile
index 87a137c..55929eb 100644
--- a/gemfiles/rails_3_zeus_0.13.gemfile
+++ b/gemfiles/rails_5_zeus_0.13.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "3.2.21"
-gem "zeus", "0.13.3"
+gem "rails", "~> 5.0.0.1"
+gem "zeus", "~> 0.13.3"
 
 gemspec :path => "../"
diff --git a/gemfiles/rails_3_zeus_0.15.gemfile b/gemfiles/rails_5_zeus_0.15.gemfile
similarity index 65%
rename from gemfiles/rails_3_zeus_0.15.gemfile
rename to gemfiles/rails_5_zeus_0.15.gemfile
index 5cf710a..7fe8348 100644
--- a/gemfiles/rails_3_zeus_0.15.gemfile
+++ b/gemfiles/rails_5_zeus_0.15.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "3.2.21"
-gem "zeus", "0.15.4"
+gem "rails", "~> 5.0.0.1"
+gem "zeus", "~> 0.15.4"
 
 gemspec :path => "../"