diff --git a/lib/OpenLayers/Layer.js b/lib/OpenLayers/Layer.js
index 5b234dfa5b..f8ddfbe9fd 100644
--- a/lib/OpenLayers/Layer.js
+++ b/lib/OpenLayers/Layer.js
@@ -736,12 +736,6 @@ OpenLayers.Layer = OpenLayers.Class({
             this.visibility = visibility;
             this.display(visibility);
             this.redraw();
-            if (this.map != null) {
-                this.map.events.triggerEvent("changelayer", {
-                    layer: this,
-                    property: "visibility"
-                });
-            }
             this.events.triggerEvent("visibilitychanged");
         }
     },
diff --git a/tests/Layer.html b/tests/Layer.html
index f658e478fb..22935f7e3a 100644
--- a/tests/Layer.html
+++ b/tests/Layer.html
@@ -859,7 +859,7 @@
     }
 
     function test_display(t) {
-        t.plan(8);
+        t.plan(9);
 
         var map, layer, log;
 
@@ -887,11 +887,14 @@
         layer.display(true);
         t.eq(layer.div.style.display, "block", "display() set layer's display style to correct value");
         t.eq(layer.getVisibility(), false, "display() does not affect layer's visibility state");
+        layer.setVisibility(true);
 
         // This call must not trig the event because the opacity value is the same.
         log = [];
         layer.display(true);
         t.eq(log.length, 0, "display() does not trigger changelayer if the display value is the same");
+        layer.setVisibility(false);
+        t.eq(log.length, 1, "changelayer event called only once. setVisibility doesn't fire any extra changelayer events");
     }
 
 /******