diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/CommentContentTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/CommentContentTest.java
new file mode 100644
index 0000000000..b069985b27
--- /dev/null
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/CommentContentTest.java
@@ -0,0 +1,9 @@
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.java.rule.documentation;
+
+public class CommentContentTest extends DocumentationRulesTest {
+    // no additional unit tests
+}
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/CommentRequiredRuleTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/CommentRequiredTest.java
similarity index 96%
rename from pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/CommentRequiredRuleTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/CommentRequiredTest.java
index a80bee1af9..36c00b4a86 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/CommentRequiredRuleTest.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/CommentRequiredTest.java
@@ -15,8 +15,7 @@ import org.junit.Test;
 import net.sourceforge.pmd.Rule;
 import net.sourceforge.pmd.properties.PropertyDescriptor;
 
-public class CommentRequiredRuleTest {
-
+public class CommentRequiredTest extends DocumentationRulesTest {
     @Test
     public void allCommentTypesIgnored() {
         CommentRequiredRule rule = new CommentRequiredRule();
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/CommentSizeTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/CommentSizeTest.java
new file mode 100644
index 0000000000..cada1f1973
--- /dev/null
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/CommentSizeTest.java
@@ -0,0 +1,9 @@
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.java.rule.documentation;
+
+public class CommentSizeTest extends DocumentationRulesTest {
+    // no additional unit tests
+}
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/DocumentationRulesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/DocumentationRulesTest.java
index 920ec041e5..15efc2d668 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/DocumentationRulesTest.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/DocumentationRulesTest.java
@@ -9,17 +9,12 @@ import net.sourceforge.pmd.testframework.SimpleAggregatorTst;
 /**
  * Rule tests for the documentation category
  */
-public class DocumentationRulesTest extends SimpleAggregatorTst {
+public abstract class DocumentationRulesTest extends SimpleAggregatorTst {
 
     private static final String RULESET = "category/java/documentation.xml";
 
     @Override
     public void setUp() {
-        addRule(RULESET, "CommentContent");
-        addRule(RULESET, "CommentRequired");
-        addRule(RULESET, "CommentSize");
-        addRule(RULESET, "UncommentedEmptyConstructor");
-        addRule(RULESET, "UncommentedEmptyMethodBody");
+        addRule(RULESET, getClass().getSimpleName().replaceFirst("Test$", ""));
     }
-
 }
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/UncommentedEmptyConstructorTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/UncommentedEmptyConstructorTest.java
new file mode 100644
index 0000000000..0fc2e3d7d5
--- /dev/null
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/UncommentedEmptyConstructorTest.java
@@ -0,0 +1,9 @@
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.java.rule.documentation;
+
+public class UncommentedEmptyConstructorTest extends DocumentationRulesTest {
+    // no additional unit tests
+}
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/UncommentedEmptyMethodBodyTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/UncommentedEmptyMethodBodyTest.java
new file mode 100644
index 0000000000..d93ec5978c
--- /dev/null
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/UncommentedEmptyMethodBodyTest.java
@@ -0,0 +1,9 @@
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.java.rule.documentation;
+
+public class UncommentedEmptyMethodBodyTest extends DocumentationRulesTest {
+    // no additional unit tests
+}