Index: trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java	(revision 12636)
+++ trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java	(revision 12637)
@@ -19,7 +19,7 @@
 import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MainApplicationTest;
 import org.openstreetmap.josm.gui.MainPanel;
 import org.openstreetmap.josm.gui.layer.LayerManagerTest.TestLayer;
-import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.CertificateAmendment;
@@ -201,7 +201,9 @@
      * Make sure {@code Main.toolbar} is initialized.
      */
+    @SuppressWarnings("deprecation")
     public static void initToolbar() {
+        MainApplicationTest.initToolbar();
         if (Main.toolbar == null) {
-            Main.toolbar = new ToolbarPreferences();
+            Main.toolbar = MainApplication.getToolbar();
         }
     }
Index: trunk/test/unit/org/openstreetmap/josm/MainTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/MainTest.java	(revision 12636)
+++ trunk/test/unit/org/openstreetmap/josm/MainTest.java	(revision 12637)
@@ -13,6 +13,4 @@
 import java.util.Collection;
 import java.util.Map;
-
-import javax.swing.UIManager;
 
 import org.junit.Rule;
@@ -81,6 +79,4 @@
         Main.preConstructorInit();
         assertNotNull(Main.getProjection());
-        assertEquals(Main.pref.get("laf", Main.platform.getDefaultStyle()), UIManager.getLookAndFeel().getClass().getCanonicalName());
-        assertNotNull(Main.toolbar);
     }
 
Index: trunk/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java	(revision 12636)
+++ trunk/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java	(revision 12637)
@@ -19,6 +19,9 @@
 import java.util.concurrent.Future;
 
+import javax.swing.UIManager;
+
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.Version;
@@ -26,4 +29,5 @@
 import org.openstreetmap.josm.gui.SplashScreen.SplashProgressMonitor;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
+import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
 import org.openstreetmap.josm.plugins.PluginHandler;
 import org.openstreetmap.josm.plugins.PluginHandlerTestIT;
@@ -47,4 +51,13 @@
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules().main().https().devAPI().timeout(20000);
+
+    /**
+     * Make sure {@link MainApplication#toolbar} is initialized.
+     */
+    public static void initToolbar() {
+        if (MainApplication.toolbar == null) {
+            MainApplication.toolbar = new ToolbarPreferences();
+        }
+    }
 
     @SuppressFBWarnings(value = "DM_DEFAULT_ENCODING")
@@ -132,4 +145,13 @@
     }
 
+    /**
+     * Unit test of {@link MainApplication#setupUIManager}.
+     */
+    @Test
+    public void testSetupUIManager() {
+        MainApplication.setupUIManager();
+        assertEquals(Main.pref.get("laf", Main.platform.getDefaultStyle()), UIManager.getLookAndFeel().getClass().getCanonicalName());
+    }
+
     private static PluginInformation newPluginInformation(String plugin) throws PluginListParseException {
         return PluginListParser.createInfo(plugin+".jar", "https://svn.openstreetmap.org/applications/editors/josm/dist/"+plugin+".jar",