diff --git a/core/lib/Drupal/Core/Cache/BackendChain.php b/core/lib/Drupal/Core/Cache/BackendChain.php
index af8af0d91174..851978b2930e 100644
--- a/core/lib/Drupal/Core/Cache/BackendChain.php
+++ b/core/lib/Drupal/Core/Cache/BackendChain.php
@@ -19,7 +19,6 @@ namespace Drupal\Core\Cache;
  *
  * @ingroup cache
  */
-
 class BackendChain implements CacheBackendInterface, CacheTagsInvalidatorInterface {
 
   /**
diff --git a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItemWithDependencies.php b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItemWithDependencies.php
index d26e225456d7..f1e96dc4024f 100644
--- a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItemWithDependencies.php
+++ b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItemWithDependencies.php
@@ -21,7 +21,6 @@ use Drupal\Core\Field\FieldDefinitionInterface;
  *   }
  * )
  */
-
 class TestItemWithDependencies extends TestItem {
 
   /**
diff --git a/core/modules/forum/src/Form/Overview.php b/core/modules/forum/src/Form/Overview.php
index 9e77482c14ef..ba9c033de723 100644
--- a/core/modules/forum/src/Form/Overview.php
+++ b/core/modules/forum/src/Form/Overview.php
@@ -10,7 +10,7 @@ use Drupal\taxonomy\Form\OverviewTerms;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-/*
+/**
  * Provides forum overview form for the forum vocabulary.
  */
 class Overview extends OverviewTerms {
diff --git a/core/modules/taxonomy/src/Form/OverviewTerms.php b/core/modules/taxonomy/src/Form/OverviewTerms.php
index b5f1ef7f69d6..cdc661956b2d 100644
--- a/core/modules/taxonomy/src/Form/OverviewTerms.php
+++ b/core/modules/taxonomy/src/Form/OverviewTerms.php
@@ -9,7 +9,7 @@ use Drupal\Core\Form\FormStateInterface;
 use Drupal\taxonomy\VocabularyInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
-/*
+/**
  * Provides terms overview form for a taxonomy vocabulary.
  */
 class OverviewTerms extends FormBase {
diff --git a/core/modules/views/tests/src/Unit/Plugin/pager/PagerPluginBaseTest.php b/core/modules/views/tests/src/Unit/Plugin/pager/PagerPluginBaseTest.php
index b6e15d7b0c10..f137105ddb4d 100644
--- a/core/modules/views/tests/src/Unit/Plugin/pager/PagerPluginBaseTest.php
+++ b/core/modules/views/tests/src/Unit/Plugin/pager/PagerPluginBaseTest.php
@@ -249,7 +249,9 @@ class PagerPluginBaseTest extends UnitTestCase {
 
 }
 
-// As StatementInterface extends \Traversable, which though always needs
-// an additional interface. The Statement class itself can't be mocked because
-// of its __wakeup function.
+/**
+ * As StatementInterface extends \Traversable, which though always needs
+ * an additional interface. The Statement class itself can't be mocked because
+ * of its __wakeup function.
+ */
 interface TestStatementInterface extends StatementInterface, \Iterator {}
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index 129168ab16b2..66aa48526c6b 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -17,6 +17,9 @@
   <rule ref="Drupal.Classes.UnusedUseStatement"/>
   <rule ref="Drupal.CSS.ClassDefinitionNameSpacing"/>
   <rule ref="Drupal.CSS.ColourDefinition"/>
+  <rule ref="Drupal.Commenting.ClassComment">
+    <exclude name="Drupal.Commenting.ClassComment.Missing"/>
+  </rule>
   <rule ref="Drupal.Commenting.DocComment">
     <!-- Sniff for these errors: SpacingAfterTagGroup, WrongEnd, SpacingBetween,
       ContentAfterOpen, SpacingBeforeShort, TagValueIndent, ShortStartSpace,