.../config/src/Tests/CacheabilityMetadataConfigOverrideTest.php      | 5 ++---
 .../config/tests/config_override_test/src/ConfigOverrider.php        | 1 -
 core/modules/views_ui/src/ViewUI.php                                 | 2 --
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/core/modules/config/src/Tests/CacheabilityMetadataConfigOverrideTest.php b/core/modules/config/src/Tests/CacheabilityMetadataConfigOverrideTest.php
index 3e99d1b..b4752b5 100644
--- a/core/modules/config/src/Tests/CacheabilityMetadataConfigOverrideTest.php
+++ b/core/modules/config/src/Tests/CacheabilityMetadataConfigOverrideTest.php
@@ -86,10 +86,9 @@ public function testConfigEntityOverride() {
 
     // Check that renaming a config entity does not have the original config
     // entity's cache tag.
-    $block->setOriginalId('call_to_looting')->save();
+    $block->set('id', 'call_to_looting')->save();
     $this->assertEqual(['pirate_day'], $block->getCacheContexts());
-    // @todo Uncomment once https://www.drupal.org/node/2539116 lands.
-//    $this->assertEqual(['config:block.block.call_to_looting', 'pirate-day-tag'], $block->getCacheTags());
+    $this->assertEqual(['config:block.block.call_to_looting', 'pirate-day-tag'], $block->getCacheTags());
     $this->assertEqual(PirateDayCacheContext::PIRATE_DAY_MAX_AGE, $block->getCacheMaxAge());
   }
 
diff --git a/core/modules/config/tests/config_override_test/src/ConfigOverrider.php b/core/modules/config/tests/config_override_test/src/ConfigOverrider.php
index 3c9d84e..d192384 100644
--- a/core/modules/config/tests/config_override_test/src/ConfigOverrider.php
+++ b/core/modules/config/tests/config_override_test/src/ConfigOverrider.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\config_override_test;
 
-use Drupal\Core\Cache\Cache;
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Config\ConfigFactoryOverrideInterface;
 
diff --git a/core/modules/views_ui/src/ViewUI.php b/core/modules/views_ui/src/ViewUI.php
index 3234869..8168bf2 100644
--- a/core/modules/views_ui/src/ViewUI.php
+++ b/core/modules/views_ui/src/ViewUI.php
@@ -10,8 +10,6 @@
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\Timer;
 use Drupal\Component\Utility\Xss;
-use Drupal\Core\Cache\Cache;
-use Drupal\Core\Cache\CacheableDependencyInterface;
 use Drupal\Core\EventSubscriber\AjaxResponseSubscriber;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;