diff --git a/core/tests/Drupal/Tests/Core/Controller/ControllerBaseTest.php b/core/tests/Drupal/Tests/Core/Controller/ControllerBaseTest.php
index f099662..6b1d624 100644
--- a/core/tests/Drupal/Tests/Core/Controller/ControllerBaseTest.php
+++ b/core/tests/Drupal/Tests/Core/Controller/ControllerBaseTest.php
@@ -31,7 +31,7 @@ public static function getInfo() {
   }
 
   protected function setUp() {
-    $this->controller = new TestController();
+    $this->controller = $this->getObjectForTrait('Drupal\Core\Controller\ControllerBaseTrait');
   }
 
   /**
@@ -66,11 +66,3 @@ public function testGetConfig() {
   }
 
 }
-
-/**
- * Test controller implementing the ControllerBaseTrait.
- */
-class TestController {
-  use ControllerBaseTrait;
-
-}