diff --git a/pmd-xml/src/main/resources/category/xml/errorprone.xml b/pmd-xml/src/main/resources/category/xml/errorprone.xml
index c868b036f0..46f598d8e4 100644
--- a/pmd-xml/src/main/resources/category/xml/errorprone.xml
+++ b/pmd-xml/src/main/resources/category/xml/errorprone.xml
@@ -30,7 +30,18 @@ An XML CDATA section begins with a <![CDATA[ marker, which has only one [, an
         </properties>
         <example>
 <![CDATA[
-An extra [ looks like &lt;![CDATA[[]]&gt;, and an extra ] looks like &lt;![CDATA[]]]&gt;.
+<root>
+    <child>
+        <![CDATA[[ character data ]]><![CDATA[]]]]><![CDATA[> - this cdata section is valid, but it contains an
+        additional square bracket at the beginning.
+        It should probably be just <![CDATA[ character data ]]><![CDATA[]]]]><![CDATA[>.
+    </child>
+    <child>
+        <![CDATA[ character data ]]]><![CDATA[]]]]><![CDATA[> - this cdata section is valid, but it contains an
+        additional square bracket in the end.
+        It should probably be just <![CDATA[ character data ]]><![CDATA[]]]]><![CDATA[>.
+    </child>
+</root>
 ]]>
         </example>
     </rule>
diff --git a/pmd-xml/src/test/resources/net/sourceforge/pmd/lang/xml/rule/errorprone/xml/MistypedCDATASection.xml b/pmd-xml/src/test/resources/net/sourceforge/pmd/lang/xml/rule/errorprone/xml/MistypedCDATASection.xml
index 45388522ab..c748e2e5e4 100644
--- a/pmd-xml/src/test/resources/net/sourceforge/pmd/lang/xml/rule/errorprone/xml/MistypedCDATASection.xml
+++ b/pmd-xml/src/test/resources/net/sourceforge/pmd/lang/xml/rule/errorprone/xml/MistypedCDATASection.xml
@@ -70,4 +70,34 @@
      ]]></code>
 		<source-type>xml</source-type>
 	</test-code>
+    <test-code>
+        <description>Example code</description>
+        <expected-problems>2</expected-problems>
+        <expected-linenumbers>3,8</expected-linenumbers>
+        <code><![CDATA[
+<root>
+    <child>
+        <![CDATA[ character data ]]]><![CDATA[]]]]><![CDATA[> - this cdata section is valid, but it contains an
+        additional square bracket in the end.
+        It should probably be just <![CDATA[ character data ]]><![CDATA[]]]]><![CDATA[>.
+    </child>
+    <child>
+        <![CDATA[[ character data ]]><![CDATA[]]]]><![CDATA[> - this cdata section is valid, but it contains an
+        additional square bracket at the beginning.
+        It should probably be just <![CDATA[ character data ]]><![CDATA[]]]]><![CDATA[>.
+    </child>
+</root>
+        ]]></code>
+    </test-code>
+    <test-code>
+        <description>Square bracket at end separate by space is ok</description>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+<root>
+    <child>
+        <![CDATA[ character data[] ]]><![CDATA[]]]]><![CDATA[>
+    </child>
+</root>
+        ]]></code>
+    </test-code>
 </test-data>