Index: /trunk/test/unit/org/openstreetmap/josm/TestUtils.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/TestUtils.java	(revision 12044)
+++ /trunk/test/unit/org/openstreetmap/josm/TestUtils.java	(revision 12045)
@@ -6,4 +6,5 @@
 
 import java.awt.Component;
+import java.awt.Container;
 import java.awt.Graphics2D;
 import java.io.File;
@@ -17,4 +18,6 @@
 import java.util.Collection;
 import java.util.Comparator;
+import java.util.Objects;
+import java.util.stream.Stream;
 
 import org.openstreetmap.josm.command.Command;
@@ -307,3 +310,24 @@
         }
     }
+
+    /**
+     * Get a descendant component by name.
+     * @param root The root component to start searching from.
+     * @param name The component name
+     * @return The component with that name or null if it does not exist.
+     * @since 12045
+     */
+    public static Component getComponentByName(Component root, String name) {
+        if (name.equals(root.getName())) {
+            return root;
+        } else if (root instanceof Container) {
+            Container container = (Container) root;
+            return Stream.of(container.getComponents())
+                    .map(child -> getComponentByName(child, name))
+                    .filter(Objects::nonNull)
+                    .findFirst().orElse(null);
+        } else {
+            return null;
+        }
+    }
 }
Index: /trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java	(revision 12044)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java	(revision 12045)
@@ -6,4 +6,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -27,5 +28,11 @@
     @Test
     public void testPropertiesMerger() {
-        assertNotNull(new PropertiesMerger());
+        PropertiesMerger merger = new PropertiesMerger();
+        assertNotNull(TestUtils.getComponentByName(merger, "button.keepmycoordinates"));
+        assertNotNull(TestUtils.getComponentByName(merger, "button.keeptheircoordinates"));
+        assertNotNull(TestUtils.getComponentByName(merger, "button.undecidecoordinates"));
+        assertNotNull(TestUtils.getComponentByName(merger, "button.keepmydeletedstate"));
+        assertNotNull(TestUtils.getComponentByName(merger, "button.keeptheirdeletedstate"));
+        assertNotNull(TestUtils.getComponentByName(merger, "button.undecidedeletedstate"));
     }
 }