diff --git a/Gemfile b/Gemfile
index 1f7984c899..dc27defb05 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,7 +14,9 @@ group :test do
 end
 
 platforms :jruby do
+  gem 'activerecord-jdbc-adapter', :git => 'https://github.com/nicksieger/activerecord-jdbc-adapter.git'
   gem 'activerecord-jdbcsqlite3-adapter'
+  gem 'jruby-openssl'
 end
 
 platforms :mri_18 do
diff --git a/test/rails_app/config/boot.rb b/test/rails_app/config/boot.rb
index ea1f6717bd..ced57d00db 100644
--- a/test/rails_app/config/boot.rb
+++ b/test/rails_app/config/boot.rb
@@ -2,12 +2,7 @@
   DEVISE_ORM = (ENV["DEVISE_ORM"] || :active_record).to_sym
 end
 
-begin
-  require File.expand_path("../../../../.bundle/environment", __FILE__)
-rescue LoadError
-  require 'rubygems'
-  require 'bundler'
-  Bundler.setup :default, :test, DEVISE_ORM
-end
+require 'rubygems'
+require 'bundler/setup'
 
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+$:.unshift File.expand_path('../../../../lib', __FILE__)
\ No newline at end of file