Index: /trunk/test/unit/org/openstreetmap/josm/data/validation/tests/RelationCheckerTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/validation/tests/RelationCheckerTest.java	(revision 17944)
+++ /trunk/test/unit/org/openstreetmap/josm/data/validation/tests/RelationCheckerTest.java	(revision 17945)
@@ -149,12 +149,9 @@
         r.addMember(new RelationMember("outline", new Way()));
         r.addMember(new RelationMember("part", new Way()));
-        r.addMember(new RelationMember("level_-12", new Relation()));
-        r.addMember(new RelationMember("level_0", new Relation()));
-        r.addMember(new RelationMember("level_12", new Relation()));
-        r.addMember(new RelationMember("level_x", new Relation())); // fails
-
-        List<TestError> errors = testRelation(r);
-        assertEquals(1, errors.size());
-        assertEquals("Role 'level_x' is not among expected values 'outline/part/ridge/edge/entrance/level_-?\\d+'",
+        r.addMember(new RelationMember("level_-12", new Relation())); // fails (old tagging schema, #21048)
+
+        List<TestError> errors = testRelation(r);
+        assertEquals(1, errors.size());
+        assertEquals("Role 'level_x' is not among expected values 'outline/part/ridge/edge'",
                 errors.get(0).getDescription());
     }