diff --git a/core/modules/migrate/src/Tests/MigrateTestBase.php b/core/modules/migrate/src/Tests/MigrateTestBase.php
index b70e742..ed81e43 100644
--- a/core/modules/migrate/src/Tests/MigrateTestBase.php
+++ b/core/modules/migrate/src/Tests/MigrateTestBase.php
@@ -59,23 +59,13 @@
    */
   protected function setUp() {
     parent::setUp();
-
     $this->createMigrationConnection();
   }
 
   /**
-   * {@inheritdoc}
-   */
-  protected function tearDown() {
-    $this->cleanupMigrateConnection();
-    parent::tearDown();
-    $this->databaseDumpFiles = [];
-    $this->collectMessages = FALSE;
-    unset($this->migration, $this->migrateMessages);
-  }
-
-  /**
    * Changes the database connection to the prefixed one.
+   *
+   * @todo this can be removed when we don't rely on global connections. https://www.drupal.org/node/2552791
    */
   private function createMigrationConnection() {
 
@@ -107,6 +97,17 @@ private function createMigrationConnection() {
   }
 
   /**
+   * {@inheritdoc}
+   */
+  protected function tearDown() {
+    $this->cleanupMigrateConnection();
+    parent::tearDown();
+    $this->databaseDumpFiles = [];
+    $this->collectMessages = FALSE;
+    unset($this->migration, $this->migrateMessages);
+  }
+
+  /**
    * Cleans up the test migrate connection.
    */
   private function cleanupMigrateConnection() {