diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityApiTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityApiTest.php
index 490750e72de..4f693c97b3c 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityApiTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityApiTest.php
@@ -104,8 +104,7 @@ class EntityApiTest extends EntityUnitTestBase {
   }
 
   /**
-   * Tests that exceptions are properly thrown when saving or deleting an
-   * entity.
+   * Tests that exceptions are thrown when saving or deleting an entity.
    */
   public function testEntityStorageExceptionHandling() {
     $entity = entity_create('entity_test', array('name' => 'test'));
diff --git a/core/modules/system/tests/modules/entity_test/entity_test.module b/core/modules/system/tests/modules/entity_test/entity_test.module
index 9bc96829e6e..6c3a078dc69 100644
--- a/core/modules/system/tests/modules/entity_test/entity_test.module
+++ b/core/modules/system/tests/modules/entity_test/entity_test.module
@@ -110,7 +110,7 @@ function entity_test_create_bundle($bundle, $text = NULL, $entity_type = 'entity
  * @param string $bundle_old
  *   The machine-readable name of the bundle to rename.
  * @param string $bundle_new
- *   The new machine-readable name of the bundle
+ *   The new machine-readable name of the bundle.
  * @param string $entity_type
  *   (optional) The entity type for which the bundle is renamed. Defaults to
  *   'entity_test'.
@@ -203,7 +203,7 @@ function entity_test_entity_extra_field_info() {
     'display' => array(
       // Note: those extra fields do not currently display anything, they are
       // just used in \Drupal\entity\Tests\EntityDisplayTest to test the
-      // behavior of entity display objects,
+      // behavior of entity display objects.
       'display_extra_field' => array(
         'label' => t('Display extra field'),
         'description' => t('An extra field on the display side.'),
@@ -360,7 +360,7 @@ function entity_test_entity_form_display_alter(EntityFormDisplay $form_display,
 }
 
 /**
- * Implements hook_entity_presave()
+ * Implements hook_entity_presave().
  */
 function entity_test_entity_presave(EntityInterface $entity) {
   if (isset($GLOBALS['entity_test_throw_exception'])) {
@@ -369,7 +369,7 @@ function entity_test_entity_presave(EntityInterface $entity) {
 }
 
 /**
- * Implements hook_entity_predelete()
+ * Implements hook_entity_predelete().
  */
 function entity_test_entity_predelete(EntityInterface $entity) {
   if (isset($GLOBALS['entity_test_throw_exception'])) {