Index: /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java
===================================================================
--- /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java	(revision 4865)
+++ /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java	(revision 4866)
@@ -62,5 +62,5 @@
 	{
 		PreferenceEditor.importOldPreferences();
-        initializeTests( getTests(true, true) );
+        initializeTests( getAllTests() );
 	}
 	
@@ -119,5 +119,28 @@
 		return (OSMValidatorPlugin)Util.getPlugin(OSMValidatorPlugin.class);
 	}
-	
+
+	/** Gets a map from simple names to all tests. */
+	public static Map<String, Test> getAllTestsMap() {
+		Map<String, Test> tests = new HashMap<String, Test>();
+		for(Class<Test> testClass : getAllAvailableTests() )
+		{
+			try {
+				Test test = testClass.newInstance();
+				tests.put(testClass.getSimpleName(), test);
+			}
+			catch( Exception e)
+			{
+				e.printStackTrace();
+				continue;
+			}
+		}
+		return tests;
+	}
+
+	/** Gets a collection of all tests. */
+	public static Collection<Test> getAllTests() {
+		return getAllTestsMap().values();
+	}
+
 	/**
 	 * Gets a collection with the available tests
@@ -130,17 +153,5 @@
 	{
 		Set<Test> tests = new HashSet<Test>();
-		Map<String, Test> enabledTests = new LinkedHashMap<String, Test>();
-		for(Class<Test> testClass : getAllAvailableTests() )
-		{
-			try {
-				Test test = testClass.newInstance();
-				enabledTests.put(testClass.getSimpleName(), test);
-			}
-			catch( Exception e)
-			{
-				e.printStackTrace();
-				continue;
-			}
-		}
+		Map<String, Test> enabledTests = getAllTestsMap();
 
 		Pattern regexp = Pattern.compile("(\\w+)=(true|false),?");
Index: /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java
===================================================================
--- /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java	(revision 4865)
+++ /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java	(revision 4866)
@@ -47,5 +47,5 @@
         testPanel.add( new JLabel("On upload"), GBC.eop() );
         
-		allTests = OSMValidatorPlugin.getTests(true, true);
+		allTests = OSMValidatorPlugin.getAllTests();
 		for(Test test: allTests) 
 		{