diff --git a/UPGRADE.md b/UPGRADE.md
index 698b19ecd73..95c71ff57ad 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -353,11 +353,6 @@ This is now deprecated. Please extend `EntityRepository` instead.
 +$entityManager->getRepository(CmsUser::class);
 ```
 
-## BC Break: `AttributeDriver` and `AnnotationDriver` no longer extends parent class from `doctrine/persistence`
-
-Both these classes used to extend an abstract `AnnotationDriver` class defined
-in `doctrine/persistence`, and no longer do.
-
 ## Deprecate `AttributeDriver::getReader()` and `AnnotationDriver::getReader()`
 
 That method was inherited from the abstract `AnnotationDriver` class of
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 39c267eadf2..a3610445083 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -44,7 +44,7 @@
     </rule>
 
     <rule ref="PSR1.Classes.ClassDeclaration.MultipleClasses">
-        <exclude-pattern>*/tests/*</exclude-pattern>
+        <exclude-pattern>tests/*</exclude-pattern>
     </rule>
 
     <rule ref="Squiz.Classes.ClassFileName.NoMatch">