only in patch2:
unchanged:
--- a/core/modules/config/lib/Drupal/config/Tests/ConfigImportUITest.php
+++ b/core/modules/config/lib/Drupal/config/Tests/ConfigImportUITest.php
@@ -286,7 +286,7 @@ function testImportDiff() {
     $staging->write($config_name, $staging_data);
 
     // Load the diff UI and verify that the diff reflects the change.
-    $this->drupalGet('admin/config/development/configuration/sync/diff/' . $config_name);
+    $this->drupalGet('admin/config/development/configuration/sync/diff/staging/active/' . $config_name);
     $this->assertTitle(format_string('View changes of @config_name | Drupal', array('@config_name' => $config_name)));
 
     // Reset data back to original, and remove a key
@@ -295,7 +295,7 @@ function testImportDiff() {
     $staging->write($config_name, $staging_data);
 
     // Load the diff UI and verify that the diff reflects a removed key.
-    $this->drupalGet('admin/config/development/configuration/sync/diff/' . $config_name);
+    $this->drupalGet('admin/config/development/configuration/sync/diff/staging/active/' . $config_name);
 
     // Reset data back to original and add a key
     $staging_data = $original_data;
@@ -303,7 +303,7 @@ function testImportDiff() {
     $staging->write($config_name, $staging_data);
 
     // Load the diff UI and verify that the diff reflects an added key.
-    $this->drupalGet('admin/config/development/configuration/sync/diff/' . $config_name);
+    $this->drupalGet('admin/config/development/configuration/sync/diff/staging/active/' . $config_name);
   }
 
   /**
only in patch2:
unchanged:
--- a/core/modules/node/lib/Drupal/node/Tests/NodeTypeRenameConfigImportTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/NodeTypeRenameConfigImportTest.php
@@ -92,9 +92,9 @@ public function testConfigurationRename() {
     $this->drupalGet('admin/config/development/configuration');
     foreach ($expected as $rename) {
       $names = $this->configImporter()->getStorageComparer()->extractRenameNames($rename);
-      $this->assertText(String::format('!source_name to !target_name', array('!source_name' => $names['old_name'], '!target_name' => $names['new_name'])));
+      $this->assertText(String::format('!source_name to !target_name', array('source' => 'staging', 'target' => 'active', '!source_name' => $names['old_name'], '!target_name' => $names['new_name'])));
       // Test that the diff link is present for each renamed item.
-      $href = \Drupal::urlGenerator()->getPathFromRoute('config.diff', array('source_name' => $names['old_name'], 'target_name' => $names['new_name']));
+      $href = \Drupal::urlGenerator()->getPathFromRoute('config.diff', array('source' => 'staging', 'target' => 'active', 'source_name' => $names['old_name'], 'target_name' => $names['new_name']));
       $this->assertLinkByHref($href);
       $hrefs[$rename] = $href;
     }