diff --git a/tests/phpunit/includes/speed-trap-listener.php b/tests/phpunit/includes/speed-trap-listener.php
index e7e3c1a61c..5f79f43094 100644
--- a/tests/phpunit/includes/speed-trap-listener.php
+++ b/tests/phpunit/includes/speed-trap-listener.php
@@ -4,7 +4,7 @@
  * A PHPUnit TestListener that exposes your slowest running tests by outputting
  * results directly to the console.
  */
-class SpeedTrapListener implements \PHPUnit_Framework_TestListener
+class SpeedTrapListener implements PHPUnit_Framework_TestListener
 {
     /**
      * Internal tracking for test suites.
@@ -51,77 +51,77 @@ class SpeedTrapListener implements \PHPUnit_Framework_TestListener
     /**
      * An error occurred.
      *
-     * @param \PHPUnit_Framework_Test $test
-     * @param \Exception              $e
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
      * @param float                   $time
      */
-    public function addError(\PHPUnit_Framework_Test $test, \Exception $e, $time)
+    public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
     {
     }
 
     /**
      * A failure occurred.
      *
-     * @param \PHPUnit_Framework_Test                 $test
-     * @param \PHPUnit_Framework_AssertionFailedError $e
+     * @param PHPUnit_Framework_Test                 $test
+     * @param PHPUnit_Framework_AssertionFailedError $e
      * @param float                                   $time
      */
-    public function addFailure(\PHPUnit_Framework_Test $test, \PHPUnit_Framework_AssertionFailedError $e, $time)
+    public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
     {
     }
 
     /**
      * Incomplete test.
      *
-     * @param \PHPUnit_Framework_Test $test
-     * @param \Exception              $e
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
      * @param float                   $time
      */
-    public function addIncompleteTest(\PHPUnit_Framework_Test $test, \Exception $e, $time)
+    public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
     {
     }
 
     /**
      * Risky test.
      *
-     * @param \PHPUnit_Framework_Test $test
-     * @param \Exception              $e
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
      * @param float                   $time
      * @since  Method available since Release 4.0.0
      */
-    public function addRiskyTest(\PHPUnit_Framework_Test $test, \Exception $e, $time)
+    public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
     {
     }
 
     /**
      * Skipped test.
      *
-     * @param \PHPUnit_Framework_Test $test
-     * @param \Exception              $e
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
      * @param float                   $time
      */
-    public function addSkippedTest(\PHPUnit_Framework_Test $test, \Exception $e, $time)
+    public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
     {
     }
 
     /**
      * A test started.
      *
-     * @param \PHPUnit_Framework_Test $test
+     * @param PHPUnit_Framework_Test $test
      */
-    public function startTest(\PHPUnit_Framework_Test $test)
+    public function startTest(PHPUnit_Framework_Test $test)
     {
     }
 
     /**
      * A test ended.
      *
-     * @param \PHPUnit_Framework_Test $test
+     * @param PHPUnit_Framework_Test $test
      * @param float                   $time
      */
-    public function endTest(\PHPUnit_Framework_Test $test, $time)
+    public function endTest(PHPUnit_Framework_Test $test, $time)
     {
-        if (!$test instanceof \PHPUnit_Framework_TestCase) return;
+        if (!$test instanceof PHPUnit_Framework_TestCase) return;
 
         $time = $this->toMilliseconds($time);
         $threshold = $this->getSlowThreshold($test);
@@ -134,9 +134,9 @@ class SpeedTrapListener implements \PHPUnit_Framework_TestListener
     /**
      * A test suite started.
      *
-     * @param \PHPUnit_Framework_TestSuite $suite
+     * @param PHPUnit_Framework_TestSuite $suite
      */
-    public function startTestSuite(\PHPUnit_Framework_TestSuite $suite)
+    public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
     {
         $this->suites++;
     }
@@ -144,9 +144,9 @@ class SpeedTrapListener implements \PHPUnit_Framework_TestListener
     /**
      * A test suite ended.
      *
-     * @param \PHPUnit_Framework_TestSuite $suite
+     * @param PHPUnit_Framework_TestSuite $suite
      */
-    public function endTestSuite(\PHPUnit_Framework_TestSuite $suite)
+    public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
     {
         $this->suites--;
 
@@ -174,10 +174,10 @@ class SpeedTrapListener implements \PHPUnit_Framework_TestListener
     /**
      * Stores a test as slow.
      *
-     * @param \PHPUnit_Framework_TestCase $test
+     * @param PHPUnit_Framework_TestCase $test
      * @param int                         $time Test execution time in milliseconds
      */
-    protected function addSlowTest(\PHPUnit_Framework_TestCase $test, $time)
+    protected function addSlowTest(PHPUnit_Framework_TestCase $test, $time)
     {
         $label = $this->makeLabel($test);
 
@@ -208,10 +208,10 @@ class SpeedTrapListener implements \PHPUnit_Framework_TestListener
     /**
      * Label for describing a test.
      *
-     * @param \PHPUnit_Framework_TestCase $test
+     * @param PHPUnit_Framework_TestCase $test
      * @return string
      */
-    protected function makeLabel(\PHPUnit_Framework_TestCase $test)
+    protected function makeLabel(PHPUnit_Framework_TestCase $test)
     {
         return sprintf('%s:%s', get_class($test), $test->getName());
     }
@@ -298,14 +298,14 @@ class SpeedTrapListener implements \PHPUnit_Framework_TestListener
      * reaches 5000ms (5 seconds):
      *
      * <code>
-     * \@slowThreshold 5000
+     * @slowThreshold 5000
      * public function testLongRunningProcess() {}
      * </code>
      *
-     * @param \PHPUnit_Framework_TestCase $test
+     * @param PHPUnit_Framework_TestCase $test
      * @return int
      */
-    protected function getSlowThreshold(\PHPUnit_Framework_TestCase $test)
+    protected function getSlowThreshold(PHPUnit_Framework_TestCase $test)
     {
         $ann = $test->getAnnotations();