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 4092)
+++ /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java	(revision 4093)
@@ -131,4 +131,5 @@
 	public static Collection<Test> getTests(boolean enabled, boolean enabledBeforeUpload)
 	{
+		Set<Test> tests = new HashSet<Test>();
 		Map<String, Test> enabledTests = new LinkedHashMap<String, Test>();
 		for(Class<Test> testClass : getAllAvailableTests() )
@@ -155,4 +156,6 @@
 			{
 				test.enabled = Boolean.valueOf(m.group(2));
+				if( enabled && test.enabled )
+					tests.add(test );
 			}
 			pos = m.end();
@@ -168,11 +171,11 @@
 			{
 				test.testBeforeUpload = Boolean.valueOf(m.group(2));
-				if( !enabled && test.enabled || !enabledBeforeUpload && test.testBeforeUpload)
-					enabledTests.remove(test.getClass().getSimpleName() );
+				if( enabledBeforeUpload && test.testBeforeUpload)
+					tests.add(test );
 			}
 			pos = m.end();
 		}
 		
-		return enabledTests.values();
+		return tests;
 	}