diff --git a/activerecord/test/cases/adapter_test.rb b/activerecord/test/cases/adapter_test.rb
index 295d78284ebd930620b99165c12927ed13dbf78b..e7a3bb9ced9381bfbe2dd40fb8e7dd286a8059b1 100644
--- a/activerecord/test/cases/adapter_test.rb
+++ b/activerecord/test/cases/adapter_test.rb
@@ -43,7 +43,7 @@ def test_indexes
 
   def test_current_database
     if @connection.respond_to?(:current_database)
-      assert_equal ENV['ARUNIT_DB_NAME'] || "activerecord_unittest", @connection.current_database
+      assert_equal ARTest.connection_config['arunit']['database'], @connection.current_database
     end
   end
 
@@ -68,7 +68,12 @@ def test_not_specifying_database_name_for_cross_database_selects
       begin
         assert_nothing_raised do
           ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations['arunit'].except(:database))
-          ActiveRecord::Base.connection.execute "SELECT activerecord_unittest.pirates.*, activerecord_unittest2.courses.* FROM activerecord_unittest.pirates, activerecord_unittest2.courses"
+
+          config = ARTest.connection_config
+          ActiveRecord::Base.connection.execute(
+            "SELECT #{config['arunit']['database']}.pirates.*, #{config['arunit2']['database']}.courses.* " \
+            "FROM #{config['arunit']['database']}.pirates, #{config['arunit2']['database']}.courses"
+          )
         end
       ensure
         ActiveRecord::Base.establish_connection 'arunit'
diff --git a/activerecord/test/support/connection.rb b/activerecord/test/support/connection.rb
index f4123c694d09864509358f2f66f4caa15f9b8f8f..fcd2e4dee5cf70734fb20648855206407317605f 100644
--- a/activerecord/test/support/connection.rb
+++ b/activerecord/test/support/connection.rb
@@ -2,11 +2,18 @@
 require_dependency 'models/course'
 
 module ARTest
+  def self.connection_name
+    ENV['ARCONN'] || config['default_connection']
+  end
+
+  def self.connection_config
+    config['connections'][connection_name]
+  end
+
   def self.connect
-    connection_name = ENV['ARCONN'] || config['default_connection']
     puts "Using #{connection_name}"
     ActiveRecord::Base.logger = Logger.new("debug.log")
-    ActiveRecord::Base.configurations = config['connections'][connection_name]
+    ActiveRecord::Base.configurations = connection_config
     ActiveRecord::Base.establish_connection 'arunit'
     Course.establish_connection 'arunit2'
   end