diff --git a/gemfiles/ar52.gemfile b/gemfiles/ar52.gemfile
index da83cd97..f1554a84 100644
--- a/gemfiles/ar52.gemfile
+++ b/gemfiles/ar52.gemfile
@@ -4,5 +4,5 @@ source "https://rubygems.org"
 gemspec path: "../"
 
 gem "activerecord", "~> 5.2.0"
+gem "activerecord-postgis-adapter", "~> 5.0"
 
-# gem "mysql2", "~> 0.4.10", platform: :ruby
diff --git a/gemfiles/ar60.gemfile b/gemfiles/ar60.gemfile
index f3602fa7..dd107d38 100644
--- a/gemfiles/ar60.gemfile
+++ b/gemfiles/ar60.gemfile
@@ -4,5 +4,4 @@ source "https://rubygems.org"
 gemspec path: "../"
 
 gem "activerecord", "~> 6.0.0"
-
-# gem "mysql2", "~> 0.4.10", platform: :ruby
+gem "activerecord-postgis-adapter", "~> 6.0"
diff --git a/gemfiles/ar61.gemfile b/gemfiles/ar61.gemfile
index 9b3dcd4a..225edb80 100644
--- a/gemfiles/ar61.gemfile
+++ b/gemfiles/ar61.gemfile
@@ -4,5 +4,4 @@ source "https://rubygems.org"
 gemspec path: "../"
 
 gem "activerecord", "~> 6.1.0"
-
-# gem "mysql2", "~> 0.4.10", platform: :ruby
+gem "activerecord-postgis-adapter", "~> 6.0"
\ No newline at end of file
diff --git a/makara.gemspec b/makara.gemspec
index 91e97e88..78bbb6fc 100644
--- a/makara.gemspec
+++ b/makara.gemspec
@@ -37,6 +37,5 @@ Gem::Specification.new do |gem|
     gem.add_development_dependency "pry-byebug"
     gem.add_development_dependency "mysql2"
     gem.add_development_dependency "pg"
-    gem.add_development_dependency "rgeo"
   end
 end
diff --git a/spec/active_record/connection_adapters/makara_postgis_adapter_spec.rb b/spec/active_record/connection_adapters/makara_postgis_adapter_spec.rb
index 85b80646..b5e00653 100644
--- a/spec/active_record/connection_adapters/makara_postgis_adapter_spec.rb
+++ b/spec/active_record/connection_adapters/makara_postgis_adapter_spec.rb
@@ -1,13 +1,8 @@
-# RGeo doesn't play well with JRuby and to avoid complicated test setup
-# we're only testing ActiveRecord version ~> 4.2
+# RGeo doesn't play well with JRuby
 
 require 'active_record'
 
-# TODO: test this in AR 5+ ?
-if RUBY_ENGINE == 'ruby' &&
-    ActiveRecord::VERSION::MAJOR == 4 &&
-    ActiveRecord::VERSION::MINOR >= 2
-
+if RUBY_ENGINE == 'ruby'
   require 'spec_helper'
   require 'rgeo'
   require 'activerecord-postgis-adapter'
diff --git a/spec/support/postgis_database.yml b/spec/support/postgis_database.yml
index dd5ec495..114a23e5 100644
--- a/spec/support/postgis_database.yml
+++ b/spec/support/postgis_database.yml
@@ -1,9 +1,6 @@
 test:
   adapter: 'makara_postgis'
   database: 'makara_test'
-  username: 'root'
-  password: ''
-
   timeout: 5000
 
   makara: