diff --git a/core/tests/Drupal/Tests/PhpunitCompatibilityTraitTest.php b/core/tests/Drupal/Tests/PhpunitCompatibilityTraitTest.php
index d667c0fed0..145980bfe5 100644
--- a/core/tests/Drupal/Tests/PhpunitCompatibilityTraitTest.php
+++ b/core/tests/Drupal/Tests/PhpunitCompatibilityTraitTest.php
@@ -3,7 +3,7 @@
 namespace Drupal\Tests;
 
 /**
- * Test the PHPUnit forward compatibility trait.
+ * Tests the PHPUnit forward compatibility trait.
  *
  * @coversDefaultClass \Drupal\Tests\PhpunitCompatibilityTrait
  * @group Tests
@@ -11,7 +11,7 @@
 class PhpunitCompatibilityTraitTest extends UnitTestCase {
 
   /**
-   * Test that getMock is available and calls the correct parent method.
+   * Tests that getMock is available and calls the correct parent method.
    *
    * @covers ::getMock
    * @dataProvider providerMockVersions
@@ -22,7 +22,7 @@ public function testGetMock($className, $expected) {
   }
 
   /**
-   * Test that createMock is available and calls the correct parent method.
+   * Tests that createMock is available and calls the correct parent method.
    *
    * @covers ::createMock
    * @dataProvider providerMockVersions
@@ -33,7 +33,7 @@ public function testCreateMock($className, $expected) {
   }
 
   /**
-   * Return the class names and the string they return.
+   * Returns the class names and the string they return.
    *
    * @return array
    */
@@ -72,6 +72,9 @@ public function getMockbuilder() {
 
 }
 
+/**
+ * Test double for PHPUnit_Framework_MockObject_MockBuilder.
+ */
 class Mockbuilder {
   public function __call($name, $arguments) {
     return $this;