diff --git a/tests/list-tests.html b/tests/list-tests.html
index 8944612c4a..f199f0aa7f 100644
--- a/tests/list-tests.html
+++ b/tests/list-tests.html
@@ -22,6 +22,7 @@
     <li>test_Tile.html</li>
     <li>test_Tile_Image.html</li>
     <li>test_Control.html</li>
+    <li>test_Control_MouseToolbar.html</li>
     <li>test_Control_LayerSwitcher.html</li>
     <li>test_Control_PanZoom.html</li>
     <li>test_Control_PanZoomBar.html</li>
diff --git a/tests/test_Control_MouseToolbar.html b/tests/test_Control_MouseToolbar.html
new file mode 100644
index 0000000000..59955acb7f
--- /dev/null
+++ b/tests/test_Control_MouseToolbar.html
@@ -0,0 +1,55 @@
+<html>
+<head>
+  <script src="../lib/OpenLayers.js"></script>
+  <script type="text/javascript"><!--
+    var map; 
+    function test_01_Control_MouseToolbar_constructor (t) {
+        t.plan( 1 );
+    
+        control = new OpenLayers.Control.MouseToolbar();
+        t.ok( control instanceof OpenLayers.Control.MouseToolbar, "new OpenLayers.Control.MouseToolbar returns object" );
+    }
+    function test_02_Control_MouseToolbar_addControl (t) {
+        t.plan( 7 );
+        map = new OpenLayers.Map('map');
+        control = new OpenLayers.Control.MouseToolbar();
+        t.ok( control instanceof OpenLayers.Control.MouseToolbar, "new OpenLayers.Control.MouseToolbar returns object" );
+        t.ok( map instanceof OpenLayers.Map, "new OpenLayers.Map creates map" );
+        map.addControl(control);
+        t.ok( control.map === map, "Control.map is set to the map object" );
+        t.ok( map.controls[2] === control, "map.controls contains control" );
+        t.eq( parseInt(control.div.style.zIndex), map.Z_INDEX_BASE['Control'] + 3, "Control div zIndexed properly" );
+        t.eq( parseInt(map.viewPortDiv.lastChild.style.zIndex), map.Z_INDEX_BASE['Control'] + 3, "Viewport div contains control div" );
+        t.eq( control.div.style.top, "6px", "Control div top located correctly by default");
+
+    }
+    function test_03_Control_MouseToolbar_control_events (t) {
+        t.plan( 1 );
+        var evt = {which: 1}; // control expects left-click
+        map = new OpenLayers.Map('map');
+        var layer = new OpenLayers.Layer.WMS("Test Layer", 
+            "http://octo.metacarta.com/cgi-bin/mapserv?",
+            {map: "/mapdata/vmap_wms.map", layers: "basic"});
+        map.addLayer(layer);
+
+        control = new OpenLayers.Control.MouseToolbar();
+        map.addControl(control);
+
+        var centerLL = new OpenLayers.LonLat(0,0); 
+        map.setCenter(centerLL, 5);
+
+        evt.shiftKey = true;
+        evt.xy = new OpenLayers.Size(5,5);
+        control.defaultMouseDown(evt);
+        evt.xy = new OpenLayers.Size(15,15);
+        control.defaultMouseUp(evt);
+        t.eq(map.getZoom(), 5, "Map zoom set correctly after zoombox");
+
+    }
+  // -->
+  </script>
+</head>
+<body>
+    <div id="map" style="width: 1024px; height: 512px;"/>
+</body>
+</html>
