diff --git a/test/unit/org/openstreetmap/josm/gui/layer/LayerTest.java b/test/unit/org/openstreetmap/josm/gui/layer/LayerTest.java
index f7127f8..a9368d3 100644
--- a/test/unit/org/openstreetmap/josm/gui/layer/LayerTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/layer/LayerTest.java
@@ -96,6 +96,19 @@ public class LayerTest {
     public void testSetName() {
         testLayer.setName("Test Layer2");
         assertEquals("Test Layer2", testLayer.getName());
+
+        testLayer = new LayerManagerTest.TestLayer() {
+            @Override
+            public AbstractProperty<Color> getColorProperty() {
+                return new ColorProperty("test", Color.RED);
+            }
+        };
+
+        testLayer.setName("Test Layer2");
+        testLayer.setName(null);
+        assertEquals("", testLayer.getName());
+        testLayer.setName("Test Layer3");
+        assertEquals("Test Layer3", testLayer.getName());
     }
 
     /**