diff --git a/pmd-eclipse-plugin/pmd-eclipse-test/test/net/sourceforge/pmd/eclipse/BasicPMDTest.java b/pmd-eclipse-plugin/pmd-eclipse-test/test/net/sourceforge/pmd/eclipse/BasicPMDTest.java
index f5cc4aa74c..b6ad4c089f 100644
--- a/pmd-eclipse-plugin/pmd-eclipse-test/test/net/sourceforge/pmd/eclipse/BasicPMDTest.java
+++ b/pmd-eclipse-plugin/pmd-eclipse-test/test/net/sourceforge/pmd/eclipse/BasicPMDTest.java
@@ -47,7 +47,6 @@ import net.sourceforge.pmd.RuleSet;
 import net.sourceforge.pmd.RuleSetFactory;
 import net.sourceforge.pmd.RuleSetNotFoundException;
 import net.sourceforge.pmd.RuleViolation;
-import net.sourceforge.pmd.eclipse.core.PluginConstants;
 import net.sourceforge.pmd.eclipse.runtime.cmd.PMDEngine;
 import net.sourceforge.pmd.lang.LanguageVersion;
 
@@ -181,15 +180,15 @@ public class BasicPMDTest extends TestCase {
      *
      */
     public void testDefaulltRuleSets() {
-        RuleSetFactory factory = new RuleSetFactory();
-        String allRuleSets[] = PluginConstants.PMD_JAVA_RULESETS;
-        for (String allRuleSet : allRuleSets) {
-            try {
-                RuleSet ruleSet = factory.createRuleSet(allRuleSet);
-            } catch (RuleSetNotFoundException e) {
-                e.printStackTrace();
-                fail("unable to load ruleset " + allRuleSet);
+        try {
+            RuleSetFactory factory = new RuleSetFactory();
+            Iterator<RuleSet> iterator = factory.getRegisteredRuleSets();
+            while (iterator.hasNext()) {
+                iterator.next();
             }
+        } catch (RuleSetNotFoundException e) {
+            e.printStackTrace();
+            fail("unable to load registered rulesets ");
         }
     }
 }
\ No newline at end of file
diff --git a/pmd-eclipse-plugin/pmd-eclipse-test/test/net/sourceforge/pmd/eclipse/core/PMDCorePluginTest.java b/pmd-eclipse-plugin/pmd-eclipse-test/test/net/sourceforge/pmd/eclipse/core/PMDCorePluginTest.java
index 32cf3d9a43..2b3dd06358 100644
--- a/pmd-eclipse-plugin/pmd-eclipse-test/test/net/sourceforge/pmd/eclipse/core/PMDCorePluginTest.java
+++ b/pmd-eclipse-plugin/pmd-eclipse-test/test/net/sourceforge/pmd/eclipse/core/PMDCorePluginTest.java
@@ -87,9 +87,10 @@ public class PMDCorePluginTest extends TestCase {
         assertFalse("No registered rulesets!", registeredRuleSets.isEmpty());
 
         RuleSetFactory factory = new RuleSetFactory();
-        for (String element : PluginConstants.PMD_JAVA_RULESETS) {
-            RuleSet ruleSet = factory.createRuleSet(element);
-            assertTrue("RuleSet \"" + element + "\" has not been registered", ruleSetRegistered(ruleSet,
+        Iterator<RuleSet> iterator = factory.getRegisteredRuleSets();
+        while (iterator.hasNext()) {
+            RuleSet ruleSet = iterator.next();
+            assertTrue("RuleSet \"" + ruleSet.getName() + "\" has not been registered", ruleSetRegistered(ruleSet,
                     registeredRuleSets));
         }
     }
@@ -104,9 +105,10 @@ public class PMDCorePluginTest extends TestCase {
         assertFalse("No registered default rulesets!", defaultRuleSets.isEmpty());
 
         RuleSetFactory factory = new RuleSetFactory();
-        for (String element : PluginConstants.PMD_JAVA_RULESETS) {
-            RuleSet ruleSet = factory.createRuleSet(element);
-            assertTrue("RuleSet \"" + element + "\" has not been registered", ruleSetRegistered(ruleSet,
+        Iterator<RuleSet> iterator = factory.getRegisteredRuleSets();
+        while (iterator.hasNext()) {
+            RuleSet ruleSet = iterator.next();
+            assertTrue("RuleSet \"" + ruleSet.getName() + "\" has not been registered", ruleSetRegistered(ruleSet,
                     defaultRuleSets));
         }
     }