2 files changed, 13 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index f0e9d570f5..033606f9d9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 script: 'ci/travis.rb'
 before_install:
   - travis_retry gem install bundler
+  - "rvm current | grep 'jruby' && export AR_JDBC=true || echo"
 rvm:
   - 1.9.3
   - 2.0.0
diff --git a/Gemfile b/Gemfile
index 2b79c25b11..fbb0e0fd49 100644
--- a/Gemfile
+++ b/Gemfile
@@ -63,11 +63,18 @@ end
 
 platforms :jruby do
   gem 'json'
-  gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
-
-  group :db do
-    gem 'activerecord-jdbcmysql-adapter', '>= 1.3.0'
-    gem 'activerecord-jdbcpostgresql-adapter', '>= 1.3.0'
+  if ENV['AR_JDBC']
+    gem 'activerecord-jdbcsqlite3-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master'
+    group :db do
+      gem 'activerecord-jdbcmysql-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master'
+      gem 'activerecord-jdbcpostgresql-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master'
+    end
+  else
+    gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
+    group :db do
+      gem 'activerecord-jdbcmysql-adapter', '>= 1.3.0'
+      gem 'activerecord-jdbcpostgresql-adapter', '>= 1.3.0'
+    end
   end
 end