diff --git a/.travis.yml b/.travis.yml
index 773e409d..e3b87cbf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ language: ruby
 rvm:
   - 2.2.7
   - 2.3.4
-  - 2.4.1
+  - 2.4.3
 # Load database schema before rake
 before_script: bundle exec rake db:schema:load
 # Test on all supported rails versions
@@ -12,3 +12,5 @@ gemfile:
   - gemfiles/rails4_2.gemfile
   - gemfiles/rails5_0.gemfile
   - gemfiles/rails5_1.gemfile
+  - gemfiles/rails5_2.gemfile
+  - gemfiles/rails6_0.gemfile
diff --git a/Appraisals b/Appraisals
index 2cd73a66..ef867539 100644
--- a/Appraisals
+++ b/Appraisals
@@ -13,3 +13,19 @@ appraise 'rails5_1' do
   gem 'rails', '~> 5.1.3'
   gem 'globalize', '~> 5.1.0.beta2'
 end
+
+appraise 'rails5_2' do
+  gem 'devise', '~> 4.5'
+  gem 'rails', '~> 5.2.1'
+  gem 'globalize', github: 'globalize/globalize', ref: 'e37c471775d196cd4318e61954572c300c015467'
+end
+
+appraise 'rails6_0' do
+  gem 'devise', '~> 4.7.1'
+  gem 'rails', '~> 6.0.0'
+  gem 'actionpack', '~> 6.0.0'
+  gem 'activerecord', '~> 6.0.0'
+  gem 'activesupport', '~> 6.0.0'
+  gem 'capybara', '~> 2.15'
+  gem 'globalize', '~> 5.3.1'
+end
diff --git a/activeadmin-globalize.gemspec b/activeadmin-globalize.gemspec
index ca5a02ab..a23e4f10 100644
--- a/activeadmin-globalize.gemspec
+++ b/activeadmin-globalize.gemspec
@@ -15,8 +15,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{app,config,db,lib}/**/*'] + %w(MIT-LICENSE README.md)
 
-  s.add_dependency 'activeadmin', '>= 1.0', '< 1.2'
-  # Try to support rails from 3.2 up to 4.2.x
+  s.add_dependency 'activeadmin', '>= 1.0', '<= 2.6.1'
+  # Try to support rails from 3.2 up to 5.2.x
   s.add_dependency 'globalize', '>= 3.1.0', '< 6.0'
 
   # development dependencies
diff --git a/gemfiles/rails5_2.gemfile b/gemfiles/rails5_2.gemfile
new file mode 100644
index 00000000..29f05e15
--- /dev/null
+++ b/gemfiles/rails5_2.gemfile
@@ -0,0 +1,30 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sass-rails"
+gem "coffee-rails"
+gem "therubyracer", platforms: :ruby
+gem "uglifier"
+gem "jquery-rails"
+gem "devise", "~> 4.5"
+gem "rails", "~> 5.2.1"
+gem "globalize", github: "globalize/globalize", ref: "e37c471775d196cd4318e61954572c300c015467"
+
+group :test do
+  gem "sqlite3", "~> 1.3.5"
+  gem "rspec-rails", "~> 3.6.1"
+  gem "factory_girl_rails", "~> 4.2.1"
+  gem "database_cleaner", "~> 1.0.1"
+  gem "spring", require: false
+  gem "spring-commands-rspec", require: false
+  gem "capybara", "~> 2.15"
+  gem "capybara-screenshot"
+  gem "poltergeist"
+  gem "fuubar", "~> 2.2"
+  gem "appraisal"
+  gem "awesome_print"
+  gem "pry"
+end
+
+gemspec path: "../"
diff --git a/gemfiles/rails6_0.gemfile b/gemfiles/rails6_0.gemfile
new file mode 100644
index 00000000..f8ac72d0
--- /dev/null
+++ b/gemfiles/rails6_0.gemfile
@@ -0,0 +1,34 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sass-rails"
+gem "coffee-rails"
+gem "therubyracer", platforms: :ruby
+gem "uglifier"
+gem "jquery-rails"
+gem "devise", "~> 4.7.1"
+gem "rails", "~> 6.0.0"
+gem "actionpack", "~> 6.0.0"
+gem "activerecord", "~> 6.0.0"
+gem "activesupport", "~> 6.0.0"
+gem "capybara", "~> 2.15"
+gem "globalize", "~> 5.3.1"
+
+group :test do
+  gem "sqlite3", "~> 1.3.5"
+  gem "rspec-rails", "~> 3.6.1"
+  gem "factory_girl_rails", "~> 4.2.1"
+  gem "database_cleaner", "~> 1.0.1"
+  gem "spring", require: false
+  gem "spring-commands-rspec", require: false
+  gem "capybara", "~> 2.15"
+  gem "capybara-screenshot"
+  gem "poltergeist"
+  gem "fuubar", "~> 2.2"
+  gem "appraisal"
+  gem "awesome_print"
+  gem "pry"
+end
+
+gemspec path: "../"