diff --git a/Appraisals b/Appraisals
index 2cd73a66..48ca2b8e 100644
--- a/Appraisals
+++ b/Appraisals
@@ -4,8 +4,9 @@ appraise 'rails4_2' do
 end
 
 appraise 'rails5_0' do
-  gem 'rails', '~> 4.2.9'
-  gem 'globalize', '~> 5.0.0'
+  gem 'devise', '~> 4.0'
+  gem 'rails', '~> 5.0.7.2'
+  gem 'globalize', '~> 5.1.0'
 end
 
 appraise 'rails5_1' do
diff --git a/Gemfile b/Gemfile
index f09f859a..a8576102 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,7 +25,7 @@ gem 'uglifier'
 gem 'jquery-rails'
 
 # ActiveAdmin requires devise < 4.0
-gem 'devise', '~> 3.2'
+gem 'devise', '~> 3.5'
 
 group :test do
   gem 'sqlite3', '~> 1.3.5'
diff --git a/gemfiles/rails4_2.gemfile b/gemfiles/rails4_2.gemfile
index 4f6e65a0..73bfda7a 100644
--- a/gemfiles/rails4_2.gemfile
+++ b/gemfiles/rails4_2.gemfile
@@ -7,7 +7,7 @@ gem "coffee-rails"
 gem "therubyracer", platforms: :ruby
 gem "uglifier"
 gem "jquery-rails"
-gem "devise", "~> 3.2"
+gem "devise", "~> 3.5"
 gem "rails", "~> 4.2.9"
 gem "globalize", "~> 5.0.0"
 
diff --git a/gemfiles/rails5_0.gemfile b/gemfiles/rails5_0.gemfile
index 4f6e65a0..5b462401 100644
--- a/gemfiles/rails5_0.gemfile
+++ b/gemfiles/rails5_0.gemfile
@@ -7,9 +7,9 @@ gem "coffee-rails"
 gem "therubyracer", platforms: :ruby
 gem "uglifier"
 gem "jquery-rails"
-gem "devise", "~> 3.2"
-gem "rails", "~> 4.2.9"
-gem "globalize", "~> 5.0.0"
+gem "devise", "~> 4.0"
+gem "rails", "~> 5.0.7.2"
+gem "globalize", "~> 5.1.0"
 
 group :test do
   gem "sqlite3", "~> 1.3.5"
diff --git a/spec/dummy/app/assets/config/manifest.js b/spec/dummy/app/assets/config/manifest.js
new file mode 100644
index 00000000..25e4ccc8
--- /dev/null
+++ b/spec/dummy/app/assets/config/manifest.js
@@ -0,0 +1,2 @@
+//= link application.js
+//= link_directory ../stylesheets .css
diff --git a/spec/dummy/app/assets/javascripts/active_admin.js b/spec/dummy/app/assets/javascripts/active_admin.js
index d2b66c59..283b603d 100644
--- a/spec/dummy/app/assets/javascripts/active_admin.js
+++ b/spec/dummy/app/assets/javascripts/active_admin.js
@@ -1 +1,2 @@
 //= require active_admin/base
+//= require active_admin/active_admin_globalize.js
diff --git a/spec/dummy/app/assets/stylesheets/active_admin.css.scss b/spec/dummy/app/assets/stylesheets/active_admin.css.scss
index 90ba1d47..b1c6ccbc 100644
--- a/spec/dummy/app/assets/stylesheets/active_admin.css.scss
+++ b/spec/dummy/app/assets/stylesheets/active_admin.css.scss
@@ -1,3 +1,7 @@
+/*
+ *= require active_admin/active_admin_globalize
+ */
+
 // SASS variable overrides must be declared before loading up Active Admin's styles.
 //
 // To view the variables that Active Admin provides, take a look at
diff --git a/spec/models/article_spec.rb b/spec/models/article_spec.rb
index 3e3c6b61..5d73a407 100644
--- a/spec/models/article_spec.rb
+++ b/spec/models/article_spec.rb
@@ -4,7 +4,7 @@
 describe Article do
 
   it 'should be translatable' do
-    Article.translates?.should be_true
+    Article.translates?.should be true
   end
 
   describe 'localized article' do
@@ -12,7 +12,9 @@
     let(:article) { create(:localized_article) }
     subject { article }
 
-    it { should have(3).translations }
+    it 'should have 3 translations' do
+      article.translations.size.should == 3
+    end
 
     it 'should have italian translation' do
       I18n.with_locale :it do