Index: trunk/test/unit/org/openstreetmap/josm/tools/ShortcutTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/ShortcutTest.java	(revision 19228)
+++ trunk/test/unit/org/openstreetmap/josm/tools/ShortcutTest.java	(revision 19231)
@@ -21,8 +21,9 @@
     void testMakeTooltip() {
         final String tooltip = Shortcut.makeTooltip("Foo Bar", KeyStroke.getKeyStroke(KeyEvent.VK_J, InputEvent.SHIFT_DOWN_MASK));
-        if (Platform.determinePlatform() == Platform.OSX) {
-            assertEquals("Foo Bar (⇧+J)", tooltip);
+        final String shift = Platform.determinePlatform() == Platform.OSX ? "⇧" : "Shift";
+        if (PlatformManager.getPlatform().isHtmlSupportedInMenuTooltips()) {
+            assertEquals("<html>Foo Bar <font size='-2'>(" + shift + "+J)</font>&nbsp;</html>", tooltip);
         } else {
-            assertEquals("<html>Foo Bar <font size='-2'>(Shift+J)</font>&nbsp;</html>", tooltip);
+            assertEquals("Foo Bar (" + shift + "+J)", tooltip);
         }
     }
