diff --git a/config/src/test/java/org/springframework/security/config/doc/XsdDocumentedTests.java b/config/src/test/java/org/springframework/security/config/doc/XsdDocumentedTests.java
index ec4c1a8eba..d5e01a03d4 100644
--- a/config/src/test/java/org/springframework/security/config/doc/XsdDocumentedTests.java
+++ b/config/src/test/java/org/springframework/security/config/doc/XsdDocumentedTests.java
@@ -201,13 +201,13 @@ public class XsdDocumentedTests {
 					docAttrName = id.substring(0, id.length() - 8);
 					currentDocAttrNameToElmt = docAttrNameToParents;
 				}
-				else if (docAttrName != null && !id.startsWith(docAttrName)) {
+				else if (id.endsWith("-attributes") || docAttrName != null && !id.startsWith(docAttrName)) {
 					currentDocAttrNameToElmt = null;
 					docAttrName = null;
 				}
 			}
 			if (docAttrName != null && currentDocAttrNameToElmt != null) {
-				String expression = "^\\* <<(nsa-.*),.*>>$";
+				String expression = ".*<<(nsa-.*),.*>>.*";
 				if (line.matches(expression)) {
 					String elmtId = line.replaceAll(expression, "$1");
 					currentDocAttrNameToElmt.computeIfAbsent(docAttrName, (key) -> new ArrayList<>()).add(elmtId);