diff --git a/core/tests/Drupal/Tests/Core/Database/ConnectionTest.php b/core/tests/Drupal/Tests/Core/Database/ConnectionTest.php
index 7d03abd..c1b65cb 100644
--- a/core/tests/Drupal/Tests/Core/Database/ConnectionTest.php
+++ b/core/tests/Drupal/Tests/Core/Database/ConnectionTest.php
@@ -41,15 +41,15 @@ public static function getInfo() {
   public function providerPrefixRoundTrip() {
     return array (
       array (
-        array( '' => 'test_' ), // expected
-        'test_', // prefixInfo
+        array( '' => 'test_' ),
+        'test_',
       ),
       array (
-        array( // expected
+        array(
           'fooTable' => 'foo_',
           'barTable' => 'bar_',
         ),
-        array( // prefixInfo
+        array(
           'fooTable' => 'foo_',
           'barTable' => 'bar_',
         ),
@@ -91,9 +91,9 @@ public function testPrefixRoundTrip($expected, $prefixInfo) {
   public function providerTestPrefixTables() {
     return array (
       array (
-        'SELECT * FROM test_table', // expected
-        'test_', // prefix
-        'SELECT * FROM {table}', // query
+        'SELECT * FROM test_table',
+        'test_',
+        'SELECT * FROM {table}',
       ),
       array (
         'SELECT * FROM first_table JOIN second_thingie',
@@ -167,10 +167,10 @@ public function testEscapeMethods($expected, $name) {
   public function providerGetDriverClass() {
     return array (
       array(
-        'nonexistant_class', // expected
-        'stub', // driver
-        '\\', // namespace
-        'nonexistant_class', // class
+        'nonexistent_class',
+        'stub',
+        '\\',
+        'nonexistent_class',
       ),
       array(
         'Drupal\\Core\\Database\\Driver\\mysql\\Select',
@@ -269,6 +269,7 @@ public function providerMakeComments() {
 
   /**
    * Test Connection::makeComments().
+   *
    * @dataProvider providerMakeComments
    */
   public function testMakeComments($expected, $commentArray) {
@@ -295,6 +296,7 @@ public function providerFilterComments() {
 
   /**
    * Test Connection::filterComments().
+   *
    * @dataProvider providerFilterComments
    */
   public function testFilterComments($expected, $comment) {
diff --git a/core/tests/Drupal/Tests/Core/Database/Stub/StubConnection.php b/core/tests/Drupal/Tests/Core/Database/Stub/StubConnection.php
index e52a7d5..d36a8d1 100644
--- a/core/tests/Drupal/Tests/Core/Database/Stub/StubConnection.php
+++ b/core/tests/Drupal/Tests/Core/Database/Stub/StubConnection.php
@@ -19,6 +19,7 @@ class StubConnection extends Connection {
 
   /**
    * Public property so we can test driver loading mechanism.
+   *
    * @var string
    * @see driver().
    */
diff --git a/core/tests/Drupal/Tests/Core/Database/Stub/StubPDO.php b/core/tests/Drupal/Tests/Core/Database/Stub/StubPDO.php
index 4da0992..5653053 100644
--- a/core/tests/Drupal/Tests/Core/Database/Stub/StubPDO.php
+++ b/core/tests/Drupal/Tests/Core/Database/Stub/StubPDO.php
@@ -10,7 +10,7 @@
 /**
  * A stub of \PDO for testing purposes.
  *
- * We override the constructor method so that PHPUnit can mock the PDO class.
+ * We override the constructor method so that PHPUnit can mock the \PDO class.
  */
 class StubPDO extends \PDO {