Index: trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- trunk/src/org/openstreetmap/josm/Main.java	(revision 5176)
+++ trunk/src/org/openstreetmap/josm/Main.java	(revision 5177)
@@ -292,4 +292,11 @@
                 }
                 TaggingPresetPreference.initialize();
+                // some validator tests require the presets to be initialized
+                // TODO remove this dependency for parallel initialization
+                if (initListener != null) {
+                    initListener.updateStatus(tr("Initializing validator"));
+                }
+                validator = new OsmValidator();
+                MapView.addLayerChangeListener(validator);
                 return null;
             }
@@ -316,17 +323,4 @@
                 }
                 ImageryPreference.initialize();
-                return null;
-            }
-        });
-
-        tasks.add(new Callable<Void>() {
-
-            @Override
-            public Void call() throws Exception {
-                if (initListener != null) {
-                    initListener.updateStatus(tr("Initializing validator"));
-                }
-                validator = new OsmValidator();
-                MapView.addLayerChangeListener(validator);
                 return null;
             }