Index: /trunk/test/unit/org/openstreetmap/josm/tools/ShortcutTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/tools/ShortcutTest.java	(revision 17179)
+++ /trunk/test/unit/org/openstreetmap/josm/tools/ShortcutTest.java	(revision 17180)
@@ -31,6 +31,10 @@
     @Test
     public void testMakeTooltip() {
-        assertEquals("<html>Foo Bar <font size='-2'>(Shift+J)</font>&nbsp;</html>",
-                Shortcut.makeTooltip("Foo Bar", KeyStroke.getKeyStroke(KeyEvent.VK_J, InputEvent.SHIFT_DOWN_MASK)));
+        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);
+        } else {
+            assertEquals("<html>Foo Bar <font size='-2'>(Shift+J)</font>&nbsp;</html>", tooltip);
+        }
     }
 
