diff --git a/lib/Cake/Test/TestCase/ORM/QueryTest.php b/lib/Cake/Test/TestCase/ORM/QueryTest.php
index cd9908535aa..c51142ad69c 100644
--- a/lib/Cake/Test/TestCase/ORM/QueryTest.php
+++ b/lib/Cake/Test/TestCase/ORM/QueryTest.php
@@ -18,6 +18,7 @@
 
 use Cake\Core\Configure;
 use Cake\Database\Connection;
+use Cake\Model\ConnectionManager;
 use Cake\ORM\Query;
 use Cake\ORM\Table;
 
@@ -32,7 +33,7 @@ class QueryTest extends \Cake\TestSuite\TestCase {
 
 	public function setUp() {
 		parent::setUp();
-		$this->connection = new Connection(Configure::read('Datasource.test'));
+		$this->connection = ConnectionManager::getDataSource('test');
 		$schema = ['id' => ['type' => 'integer']];
 		$schema1 = [
 			'id' => ['type' => 'integer'],
diff --git a/lib/Cake/Test/TestCase/ORM/TableTest.php b/lib/Cake/Test/TestCase/ORM/TableTest.php
index b0587121caf..ccffd991130 100644
--- a/lib/Cake/Test/TestCase/ORM/TableTest.php
+++ b/lib/Cake/Test/TestCase/ORM/TableTest.php
@@ -18,6 +18,7 @@
 
 use Cake\Core\Configure;
 use Cake\Database\Connection;
+use Cake\Model\ConnectionManager;
 use Cake\ORM\Table;
 
 /**
@@ -58,7 +59,7 @@ class TableTest extends \Cake\TestSuite\TestCase {
 
 	public function setUp() {
 		parent::setUp();
-		$this->connection = new Connection(Configure::read('Datasource.test'));
+		$this->connection = ConnectionManager::getDataSource('test');
 	}
 
 	public function tearDown() {
diff --git a/lib/Cake/TestSuite/Fixture/TestFixture.php b/lib/Cake/TestSuite/Fixture/TestFixture.php
index d8db4794b9b..77345606a0c 100644
--- a/lib/Cake/TestSuite/Fixture/TestFixture.php
+++ b/lib/Cake/TestSuite/Fixture/TestFixture.php
@@ -56,7 +56,7 @@ class TestFixture {
  * Fields / Schema for the fixture.
  *
  * This array should be compatible with Cake\Database\Schema\Table.
- * The `_constraints`, `_options` and `_indexes` keys are reserved for defining 
+ * The `_constraints`, `_options` and `_indexes` keys are reserved for defining
  * constraints, options and indexes respectively.
  *
  * @var array