diff --git a/tests/Layer/MapServer.html b/tests/Layer/MapServer.html
index 16e59156e3..11173cb14b 100644
--- a/tests/Layer/MapServer.html
+++ b/tests/Layer/MapServer.html
@@ -1,7 +1,6 @@
 <html>
 <head>
     <script type="text/javascript">var oldAlert = window.alert, gMess; window.alert = function(message) {gMess = message; return true;};</script>
-    <script src='http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAAjpkAC9ePGem0lIq5XcMiuhR_wWLPFku8Ix9i2SXYRVK3e45q1BQUd_beF8dtzKET_EteAjPdGDwqpQ'></script>
     <script type="text/javascript">window.alert = oldAlert;</script>
     
 
@@ -216,44 +215,6 @@
 
     }    
     
-    function test_Layer_MapServer_Reproject (t) { 
-        var validkey = (window.location.protocol == "file:") ||
-                       (window.location.host == "localhost") ||
-                       (window.location.host == "openlayers.org");
-        
-        if (OpenLayers.BROWSER_NAME == "opera" || OpenLayers.BROWSER_NAME == "safari") {
-            t.plan(1);
-            t.debug_print("Can't test google reprojection in Opera or Safari.");
-        } else if(validkey) {
-            t.plan(5);
-            var map = new OpenLayers.Map('map');
-            var layer = new OpenLayers.Layer.Google("Google");
-            map.addLayer(layer);
-            layer = new OpenLayers.Layer.MapServer(name, url, params, {isBaseLayer: false, buffer: 2});
-            layer.isBaseLayer=false;
-            map.addLayer(layer);
-            map.setCenter(new OpenLayers.LonLat(0,0), 5);
-            var tile = layer.grid[0][0];
-            t.eq( tile.bounds.left, -22.5, "left side matches" ); 
-            t.eq( tile.bounds.right, -11.25, "top side matches" ); 
-            t.eq( tile.bounds.bottom.toFixed(6), '11.178402', "bottom side matches" ); 
-            t.eq( tile.bounds.top.toFixed(6), '21.943046', "top side matches" );
-            map.destroy();
-        } else {
-            t.plan(1);
-            t.debug_print("can't test google layer from " +
-                          window.location.host);
-        }
-        
-        var map = new OpenLayers.Map('map');
-        layer = new OpenLayers.Layer.MapServer(name, url, params, {buffer:2});
-        map.addLayer(layer);
-        map.setCenter(new OpenLayers.LonLat(0,0), 5);
-        var tile = layer.grid[0][0];
-        t.ok( tile.bounds.equals(new OpenLayers.Bounds(-33.75, 33.75, -22.5, 45)), "okay");
-        map.destroy();
-    }
-    
     function test_Layer_MapServer_singleTile (t) {
         t.plan( 5 );
         var map = new OpenLayers.Map('map');
diff --git a/tests/deprecated/Layer/MapServer.html b/tests/deprecated/Layer/MapServer.html
new file mode 100644
index 0000000000..93aeee0ddd
--- /dev/null
+++ b/tests/deprecated/Layer/MapServer.html
@@ -0,0 +1,59 @@
+<html>
+<head>
+<script src='http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAAjpkAC9ePGem0lIq5XcMiuhR_wWLPFku8Ix9i2SXYRVK3e45q1BQUd_beF8dtzKET_EteAjPdGDwqpQ'></script>
+
+<script src="../../OLLoader.js"></script>
+<script src="../../../lib/deprecated.js"></script>
+<script type="text/javascript">
+    var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
+    var layer; 
+
+    var name = 'Test Layer';
+    var url = "http://labs.metacarta.com/cgi-bin/mapserv";
+    var params = { map: '/mapdata/vmap_wms.map', 
+                   layers: 'basic'};
+
+    function test_Layer_MapServer_Reproject (t) { 
+        var validkey = (window.location.protocol == "file:") ||
+                       (window.location.host == "localhost") ||
+                       (window.location.host == "openlayers.org");
+
+        if (OpenLayers.BROWSER_NAME == "opera" || OpenLayers.BROWSER_NAME == "safari") {
+            t.plan(1);
+            t.debug_print("Can't test google reprojection in Opera or Safari.");
+        } else if(validkey) {
+            t.plan(5);
+            var map = new OpenLayers.Map('map');
+            var layer = new OpenLayers.Layer.Google("Google");
+            map.addLayer(layer);
+            layer = new OpenLayers.Layer.MapServer(name, url, params, {reproject: true, isBaseLayer: false, buffer: 2});
+            layer.isBaseLayer=false;
+            map.addLayer(layer);
+            map.setCenter(new OpenLayers.LonLat(0,0), 5);
+            var tile = layer.grid[0][0];
+            t.eq( tile.bounds.left, -22.5, "left side matches" ); 
+            t.eq( tile.bounds.right, -11.25, "top side matches" ); 
+            t.eq( tile.bounds.bottom.toFixed(6), '11.178402', "bottom side matches" ); 
+            t.eq( tile.bounds.top.toFixed(6), '21.943046', "top side matches" );
+            map.destroy();
+        } else {
+            t.plan(1);
+            t.debug_print("can't test google layer from " +
+                          window.location.host);
+        }
+
+        var map = new OpenLayers.Map('map');
+        layer = new OpenLayers.Layer.MapServer(name, url, params, {buffer:2});
+        map.addLayer(layer);
+        map.setCenter(new OpenLayers.LonLat(0,0), 5);
+        var tile = layer.grid[0][0];
+        t.ok( tile.bounds.equals(new OpenLayers.Bounds(-33.75, 33.75, -22.5, 45)), "okay");
+        map.destroy();
+    }
+    
+</script>
+</head>
+<body>
+<div id="map" style="width:500px;height:550px"></div>
+</body>
+</html>
diff --git a/tests/list-tests.html b/tests/list-tests.html
index db4a56faaf..9f8b003c39 100644
--- a/tests/list-tests.html
+++ b/tests/list-tests.html
@@ -223,6 +223,7 @@
     <li>deprecated/BaseTypes/Element.html</li>
     <li>deprecated/Control/MouseToolbar.html</li>
     <li>deprecated/Layer/GML.html</li>
+    <li>deprecated/Layer/MapServer.html</li>
     <li>deprecated/Layer/MapServer/Untiled.html</li>
     <li>deprecated/Layer/MultiMap.html</li>
     <li>deprecated/Layer/WFS.html</li>
