Index: trunk/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java	(revision 17686)
+++ trunk/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java	(revision 17687)
@@ -67,7 +67,6 @@
      */
     public static void initContentPane() {
-        if (MainApplication.contentPanePrivate == null) {
-            MainApplication.contentPanePrivate = new JPanel(new BorderLayout());
-        }
+        // init every time to avoid "Keystroke %s is already assigned to %s"
+        MainApplication.contentPanePrivate = new JPanel(new BorderLayout());
     }
 
@@ -104,7 +103,6 @@
      */
     public static void initToolbar() {
-        if (MainApplication.toolbar == null) {
-            MainApplication.toolbar = new ToolbarPreferences();
-        }
+        // init every time to avoid "Registered toolbar action"
+        MainApplication.toolbar = new ToolbarPreferences();
     }