Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java	(revision 7272)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java	(revision 7273)
@@ -99,5 +99,5 @@
     public void visit(Way w) {
         if (w.isUsable()) {
-            if (w.hasKey("highway") && w.hasKey("junction") && "roundabout".equals(w.get("junction"))) {
+            if (w.hasKey("highway") && CLASSIFIED_HIGHWAYS.contains(w.get("highway")) && w.hasKey("junction") && "roundabout".equals(w.get("junction"))) {
                 testWrongRoundabout(w);
             }
@@ -224,5 +224,5 @@
         }
     }
-    
+
     private void testSourceMaxspeed(OsmPrimitive p, boolean testContextHighway) {
         String value = p.get("source:maxspeed");