Index: /trunk/test/unit/org/openstreetmap/josm/actions/upload/FixDataHookTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/actions/upload/FixDataHookTest.java	(revision 14284)
+++ /trunk/test/unit/org/openstreetmap/josm/actions/upload/FixDataHookTest.java	(revision 14285)
@@ -42,5 +42,5 @@
     public void testCheckUpload() {
         // Empty data set
-        UndoRedoHandler.getInstance().getUndoCommands().clear();
+        UndoRedoHandler.getInstance().clean();
         new FixDataHook().checkUpload(new APIDataSet());
         assertTrue(UndoRedoHandler.getInstance().getUndoCommands().isEmpty());
Index: /trunk/test/unit/org/openstreetmap/josm/tools/KeyboardUtilsTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/tools/KeyboardUtilsTest.java	(revision 14284)
+++ /trunk/test/unit/org/openstreetmap/josm/tools/KeyboardUtilsTest.java	(revision 14285)
@@ -61,5 +61,9 @@
         char deadCaron2 = 0x2C7;
         testgetCharactersForKeyE00("ar", 'ذ', '>', '`', deadGrave, deadGrave2);
-        testgetCharactersForKeyE00("fr_FR", '²', '$', '`', deadGrave, deadGrave2);
+        if (PlatformManager.isPlatformUnixoid()) {
+            testgetCharactersForKeyE00("fr_FR", '²', '$', 'œ', '`', deadGrave, deadGrave2);
+        } else {
+            testgetCharactersForKeyE00("fr_FR", '²', '$', '`', deadGrave, deadGrave2);
+        }
         testgetCharactersForKeyE00("fr_CA", '#', '$', '/', '`', deadGrave, deadGrave2);
         testgetCharactersForKeyE00("sq", '\\', '`', deadGrave, deadGrave2);