Index: /trunk/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java	(revision 10949)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java	(revision 10950)
@@ -4,4 +4,5 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -191,8 +192,11 @@
     public void testGetMenuEntries() {
         OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
+        boolean mode = ExpertToggleAction.isExpert();
         ExpertToggleAction.getInstance().actionPerformed(null);
-        assertEquals(13, layer.getMenuEntries().length);
+        assertNotEquals(mode, ExpertToggleAction.isExpert());
+        assertEquals(ExpertToggleAction.isExpert() ? 16 : 13, layer.getMenuEntries().length);
         ExpertToggleAction.getInstance().actionPerformed(null);
-        assertEquals(16, layer.getMenuEntries().length);
+        assertEquals(mode, ExpertToggleAction.isExpert());
+        assertEquals(ExpertToggleAction.isExpert() ? 16 : 13, layer.getMenuEntries().length);
     }