diff --git a/lib/OpenLayers/Control/MousePosition.js b/lib/OpenLayers/Control/MousePosition.js
index d7e310f0ec..e51fa2da1d 100644
--- a/lib/OpenLayers/Control/MousePosition.js
+++ b/lib/OpenLayers/Control/MousePosition.js
@@ -61,6 +61,16 @@ OpenLayers.Control.MousePosition = OpenLayers.Class(OpenLayers.Control, {
         OpenLayers.Control.prototype.initialize.apply(this, arguments);
     },
 
+    /**
+     * Method: destroy
+     */
+     destroy: function() {
+         if (this.map) {
+             this.map.events.unregister('mousemove', this, this.redraw);
+         }
+         OpenLayers.Control.prototype.destroy.apply(this, arguments);
+     },
+
     /**
      * Method: draw
      * {DOMElement}
diff --git a/tests/Control/test_MousePosition.html b/tests/Control/test_MousePosition.html
new file mode 100644
index 0000000000..20b470914e
--- /dev/null
+++ b/tests/Control/test_MousePosition.html
@@ -0,0 +1,45 @@
+<html>
+<head>
+  <script src="../../lib/OpenLayers.js"></script>
+  <script type="text/javascript">
+
+    function test_MousePosition_constructor(t) {
+        t.plan(2);
+    
+        var control = new OpenLayers.Control.MousePosition();
+        t.ok(control instanceof OpenLayers.Control.MousePosition, "new OpenLayers.Control.MousePosition returns object");
+        t.eq(control.displayClass, "olControlMousePosition", "displayClass set correctly");
+    }
+
+    function test_MousePosition_destroy(t) {
+        t.plan(1);
+    
+        var map = new OpenLayers.Map('map');
+        var control = new OpenLayers.Control.MousePosition();
+        map.addControl(control);
+
+        var listeners = map.events.listeners.mousemove.length;
+        control.destroy();
+        
+        t.eq(map.events.listeners.mousemove.length, listeners - 1, "mousemove event is unregistered");
+    }
+
+    function test_MousePosition_addControl(t) {
+        t.plan(4);
+
+        var map = new OpenLayers.Map('map');
+        var control = new OpenLayers.Control.MousePosition();
+        map.addControl(control);
+
+        t.ok(control.map === map, "Control.map is set to the map object");
+        t.ok(map.controls[map.controls.length - 1] === control, "map.controls contains control");
+        t.eq(parseInt(control.div.style.zIndex), map.Z_INDEX_BASE['Control'] + 5, "Control div zIndexed properly" );
+        t.eq(parseInt(map.viewPortDiv.lastChild.style.zIndex), map.Z_INDEX_BASE['Control'] + 5, "Viewport div contains control div");
+    }
+
+  </script>
+</head>
+<body>
+    <div id="map" style="width: 1024px; height: 512px;"/>
+</body>
+</html>
diff --git a/tests/list-tests.html b/tests/list-tests.html
index b13a295001..afa23de227 100644
--- a/tests/list-tests.html
+++ b/tests/list-tests.html
@@ -71,6 +71,7 @@
     <li>Control/test_OverviewMap.html</li>
     <li>Control/test_NavToolbar.html</li>
     <li>Control/test_MouseToolbar.html</li>
+    <li>Control/test_MousePosition.html</li>
     <li>Control/test_LayerSwitcher.html</li>
     <li>Control/test_Panel.html</li>
     <li>Control/test_PanZoom.html</li>
