diff --git a/examples/mapserver_untiled.html b/examples/mapserver_untiled.html
index 123b6cf27c..cbb726f7bf 100644
--- a/examples/mapserver_untiled.html
+++ b/examples/mapserver_untiled.html
@@ -8,12 +8,11 @@
         }
     </style>
     <script src="../lib/OpenLayers.js"></script>
-    <script src="../lib/OpenLayers/Layer/MapServer/Untiled.js"></script>
     <script type="text/javascript">
         window.onload = function(){
             var map = new OpenLayers.Map( 'map', {maxResolution: 'auto'} );
-            var layer = new OpenLayers.Layer.MapServer.Untiled( "MapServer Untiled", 
-                    "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
+            var layer = new OpenLayers.Layer.MapServer( "MapServer Untiled", 
+                    "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'}, {singleTile: true} );
             map.addLayer(layer);
             map.setCenter(new OpenLayers.LonLat(0, 0), 1);
             map.addControl( new OpenLayers.Control.LayerSwitcher() );
diff --git a/lib/OpenLayers/Layer/MapServer/Untiled.js b/lib/OpenLayers/Layer/MapServer/Untiled.js
index f6fbcaf9b4..7f430ddf07 100644
--- a/lib/OpenLayers/Layer/MapServer/Untiled.js
+++ b/lib/OpenLayers/Layer/MapServer/Untiled.js
@@ -1,264 +1,44 @@
-/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
+/* Copyright 2006-2007 MetaCarta, Inc., published under a modified BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
  * for the full text of the license. */
+
  
 /**
- * @requires OpenLayers/Layer/HTTPRequest.js
  * @requires OpenLayers/Layer/MapServer.js
  *
- * Class: OpenLayers.Layer.MapServer.Untiled
- *
- * Inherits from:
- *  - <OpenLayers.Layer.HTTPRequest> 
+ * Class: OpenLayers.Layer.MapServer
+ * Deprecated, to be removed in 3.0 - instead use OpenLayers.Layer.MapServer and 
+ *     pass the option 'singleTile' as true.
+ * 
+ * Inherits from: 
+ *  - <OpenLayers.Layer.MapServer>
  */
-OpenLayers.Layer.MapServer.Untiled = OpenLayers.Class(
-  OpenLayers.Layer.HTTPRequest, {
+OpenLayers.Layer.MapServer.Untiled = OpenLayers.Class(OpenLayers.Layer.MapServer, {
 
     /**
-     * Constant: default_params
-     * Hashtable of default parameter key/value pairs
+     * APIProperty: singleTile
+     * {singleTile} Always true for untiled.
      */
-    default_params: {
-                      mode: "map",
-                      map_imagetype: "png"
-                     },
-    
-    /**
-     * APIProperty: reproject
-     * {Boolean} 'stretch' tiles according to base layer.
-     */
-    reproject: true,
+    singleTile: true,
 
     /**
-     * APIProperty: ratio
-     * {Float} the ratio of image/tile size to map size (this is the untiled
-     * buffer)
+     * Constructor: OpenLayers.Layer.MapServer.Untiled
+     *
+     * Parameters:
+     * name - {String} 
+     * url - {String} 
+     * params - {Object} 
+     * options - {Object} 
      */
-    ratio: 1,
-
-    /** 
-     * Property: tile
-     * {<OpenLayers.Tile.Image>}
-     */
-    tile: null,
-
-    /**
-     * Propety: doneLoading
-     * {Boolean} did the image finish loading before a new draw was initiated?
-     */
-    doneLoading: false,
-
-    /**
-    * Constructor: OpenLayers.Layer.MapServer.Untiled
-    *
-    * Parameters:
-    * name - {String} 
-    * url - {String} 
-    * params - {Object} 
-    */
     initialize: function(name, url, params, options) {
-        var newArguments = [];
-        newArguments.push(name, url, params, options);
-        OpenLayers.Layer.HTTPRequest.prototype.initialize.apply(this, 
-                                                                newArguments);
-        OpenLayers.Util.applyDefaults(
-                       this.params, 
-                       this.default_params
-                       );
-
-        // unless explicitly set in options, if the layer is transparent, 
-        // it will be an overlay        
-        if ((options == null) || (options.isBaseLayer == null)) {
-            this.isBaseLayer = ((this.params.transparent != "true") && 
-                                (this.params.transparent != true));
-        }
+        OpenLayers.Layer.MapServer.prototype.initialize.apply(this, arguments);
+        
+        var msg = "The OpenLayers.Layer.MapServer.Untiled class is deprecated and " +
+                  "will be removed in 3.0. Instead, you should use the " +
+                  "normal OpenLayers.Layer.MapServer class, passing it the option " +
+                  "'singleTile' as true.";
+        OpenLayers.Console.warn(msg);
     },    
 
-    /**
-     * APIMethod: destroy 
-     */
-    destroy: function() {
-        if (this.tile) {
-          this.tile.destroy();
-          this.tile = null;    
-        }
-        OpenLayers.Layer.HTTPRequest.prototype.destroy.apply(this, arguments);
-    },
-    
-    /**
-     * APIMethod: clone
-     * obj - {Object} 
-     * 
-     * Returns:
-     * {<OpenLayers.Layer.MapServer.Untiled>} An exact clone of this
-     * OpenLayers.Layer.MapServer.Untiled
-     */
-    clone: function (obj) {
-        
-        if (obj == null) {
-            obj = new OpenLayers.Layer.MapServer.Untiled(this.name,
-                                                         this.url,
-                                                         this.params,
-                                                         this.options);
-        }
-
-        //get all additions from superclasses
-        obj = OpenLayers.Layer.HTTPRequest.prototype.clone.apply(this, [obj]);
-
-        // copy/set any non-init, non-simple values here
-
-        return obj;
-    },    
-    
-    
-    /**
-     * Method: setMap
-     * Once HTTPRequest has set the map, we can load the image div
-     * 
-     * Parameters:
-     * map - {<OpenLayers.Map>} 
-     */
-    setMap: function(map) {
-        OpenLayers.Layer.HTTPRequest.prototype.setMap.apply(this, arguments);
-    },
-    
-    /**
-     * Method: setTileSize
-     * Set the tile size based on the map size.
-     */
-    setTileSize: function() {
-        var tileSize = this.map.getSize();
-        tileSize.w = tileSize.w * this.ratio;
-        tileSize.h = tileSize.h * this.ratio;
-        this.tileSize = tileSize;
-    },
-
-    /**
-     * Method: moveTo
-     * When it is not a dragging move (ie when done dragging)
-     *   reload and recenter the div.
-     *
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>} 
-     * zoomChanged - {Boolean} 
-     * dragging - {Boolean} 
-     */
-    moveTo:function(bounds, zoomChanged, dragging) {
-        if (!this.doneLoading) {
-            this.events.triggerEvent("loadcancel"); 
-            this.doneLoading = true; 
-        }
-        OpenLayers.Layer.HTTPRequest.prototype.moveTo.apply(this,arguments);
-        
-        if (bounds == null) {
-            bounds = this.map.getExtent();
-        }
-
-        var firstRendering = (this.tile == null);
-
-        //does the new bounds to which we need to move fall outside of the 
-        // current tile's bounds?
-        var outOfBounds = (!firstRendering &&
-                           !this.tile.bounds.containsBounds(bounds));
-
-        if ( zoomChanged || firstRendering || (!dragging && outOfBounds) ) {
-
-            //clear out the old tile 
-            if (this.tile) {
-                this.tile.clear();
-            }
-
-            //determine new tile bounds
-            var center = bounds.getCenterLonLat();
-            var tileWidth = bounds.getWidth() * this.ratio;
-            var tileHeight = bounds.getHeight() * this.ratio;
-            var tileBounds = 
-                new OpenLayers.Bounds(center.lon - (tileWidth / 2),
-                                      center.lat - (tileHeight / 2),
-                                      center.lon + (tileWidth / 2),
-                                      center.lat + (tileHeight / 2));
-
-            //determine new tile size
-            this.setTileSize();
-
-            //determine new position (upper left corner of new bounds)
-            var ul = new OpenLayers.LonLat(tileBounds.left, tileBounds.top);
-            var pos = this.map.getLayerPxFromLonLat(ul);
-
-            if ( this.tile && !this.tile.size.equals(this.tileSize)) {
-                this.tile.destroy();
-                this.tile = null;
-            }
-
-            this.events.triggerEvent("loadstart");
-            this.doneLoading = false;
-            if (!this.tile) {
-                this.tile = new OpenLayers.Tile.Image(this, pos, tileBounds, 
-                                                      null, this.tileSize);
-                this.tile.draw();
-                var onload = function() { 
-                    this.doneLoading = true; 
-                    this.events.triggerEvent("loadend"); 
-                }
-                OpenLayers.Event.observe(this.tile.imgDiv, 'load',
-                                         onload.bind(this));
-            } else {
-                this.tile.moveTo(tileBounds, pos);
-            } 
-    
-        }
-    },
-   
-    /**
-     * Method: getURL
-     *
-     * Parameters: 
-     * bounds - {<OpenLayers.Bounds>}
-     */
-    getURL: function(bounds) {
-        var url = this.getFullRequestString(
-                     {mapext:bounds.toBBOX().replace(/,/g," "),
-                      imgext:bounds.toBBOX().replace(/,/g," "),
-                      map_size: this.tileSize.w + " " + this.tileSize.h,
-                      imgx: this.tileSize.w / 2,
-                      imgy: this.tileSize.h / 2,
-                      imgxy: this.tileSize.w + " " + this.tileSize.h
-                      });
-        return url;
-    },
- 
-    
-    /**
-     * APIMehod: setUrl
-     * Once HTTPRequest has updated the url, reload the image div
-     *
-     * Parameters:
-     * newUrl - {String} 
-     */
-    setUrl: function(newUrl) {
-        OpenLayers.Layer.HTTPRequest.prototype.setUrl.apply(this, arguments);
-        this.redraw();
-    },
-   
-    /** 
-    * APIMethod: getFullRequestString
-    * combine the layer's url with its params and these newParams. 
-    *   
-    *    Add the SRS parameter from 'projection' -- this is probably
-    *     more eloquently done via a setProjection() method, but this 
-    *     works for now and always.
-    *
-    * Parameters:
-    * newParams - {Object} 
-    */
-    getFullRequestString:function(newParams) {
-        var projection = this.map.getProjection();
-        this.params.srs = (projection == "none") ? null : projection;
-
-        return OpenLayers.Layer.Grid.prototype.getFullRequestString.apply(
-                                                    this, arguments);
-    },
-    
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Layer.MapServer.Untiled"
 });
diff --git a/tests/Layer/test_MapServer.html b/tests/Layer/test_MapServer.html
index ec32e9dc69..dda74be0aa 100644
--- a/tests/Layer/test_MapServer.html
+++ b/tests/Layer/test_MapServer.html
@@ -231,6 +231,21 @@
         t.ok( tile.bounds.equals(new OpenLayers.Bounds(-33.75, 33.75, -22.5, 45)), "okay");
     }
     
+    function test_30_Layer_MapServer_singleTile (t) {
+        t.plan( 5 );
+        var map = new OpenLayers.Map('map');
+        layer = new OpenLayers.Layer.MapServer(name, url, params, {singleTile: true});
+        map.addLayer(layer);
+        map.setCenter(new OpenLayers.LonLat(0,0),5);
+        t.eq( layer.singleTile, true, "layer has singleTile property, great!" );
+        t.eq( layer.grid.length, 1, "Grid has only a single row, good enough!" );
+        t.eq( layer.grid[0].length, 1, "Grid has only a single column, good enough!" );
+        t.eq( layer.tileSize.w, 750, "Image width is correct" );
+        t.eq( layer.tileSize.h, 825, "Image height is correct" );
+    }
+
+    
+    
     function test_99_Layer_MapServer_destroy (t) {
 
         t.plan( 1 );
@@ -250,8 +265,160 @@
         
         t.ok( layer.grid == null, "grid set to null");
     }
-    
+   
+    // Untiled tests 
+   
+    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_01_Layer_MapServer_Untiled_constructor (t) {
+        t.plan( 4 );
+
+        var url = "http://labs.metacarta.com/cgi-bin/mapserv";
+        layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params);
+        t.ok( layer instanceof OpenLayers.Layer.MapServer.Untiled, "new OpenLayers.Layer.MapServer returns object" );
+        t.eq( layer.url, "http://labs.metacarta.com/cgi-bin/mapserv", "layer.url is correct (HTTPRequest inited)" );
+
+        t.eq( layer.params.mode, "map", "default mode param correctly copied");
+        t.eq( layer.params.map_imagetype, "png", "default imagetype correctly copied");
+
+
+    }
+    
+    function test_04_Layer_MapServer_Untiled_clone (t) {
+        t.plan(3);
+        
+        var url = "http://labs.metacarta.com/cgi-bin/mapserv";
+        var map = new OpenLayers.Map('map', {});
+        layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params);
+        map.addLayer(layer);
+
+        var clone = layer.clone();
+        layer.tile = [[1,2],[3,4]];
+        
+        t.ok( clone.tile != layer.tile, "clone does not copy tile");
+
+        layer.ratio += 1;
+
+        t.eq( clone.ratio, 1.5, "changing layer.ratio does not change clone.ratio -- a fresh copy was made, not just copied reference");
+
+        t.eq( clone.alpha, layer.alpha, "alpha copied correctly");
+
+        layer.tile = null;
+    }
+
+    function test_05_Layer_MapServer_Untiled_isBaseLayer(t) {
+        t.plan(3);
+        
+        var url = "http://labs.metacarta.com/cgi-bin/mapserv";
+        layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params);
+        t.ok( layer.isBaseLayer, "baselayer is true by default");
+
+        var newParams = OpenLayers.Util.extend({}, params);
+        newParams.transparent = "true";
+        layer = new OpenLayers.Layer.MapServer.Untiled(name, url, newParams);
+        t.ok( !layer.isBaseLayer, "baselayer is false when transparent is set to true");
+
+        layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params, {isBaseLayer: false});
+        t.ok( !layer.isBaseLayer, "baselayer is false when option is set to false" );
+    }
+
+    function test_06_Layer_MapServer_Untiled_mergeNewParams (t) {
+        t.plan( 5 );
+
+        var map = new OpenLayers.Map("map");
+        var url = "http://labs.metacarta.com/cgi-bin/mapserv";
+        layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params);
+        
+        var newParams = { layers: 'sooper', 
+                          chickpeas: 'image/png'};
+
+        map.addLayer(layer);
+        map.zoomToMaxExtent();
+        t.ok( !layer.grid[0][0].url.match("chickpeas"), "chickpeas is not in URL of first tile in grid" );
+
+        layer.mergeNewParams(newParams);
+        
+        t.eq( layer.params.layers, "sooper", "mergeNewParams() overwrites well");
+        t.eq( layer.params.chickpeas, "image/png", "mergeNewParams() adds well");
+        t.ok( layer.grid[0][0].url.match("chickpeas"), "chickpeas is in URL of first tile in grid" );
+
+        newParams.chickpeas = 151;
+
+        t.eq( layer.params.chickpeas, "image/png", "mergeNewParams() makes clean copy of hashtable");
+    }
+
+    function test_07_Layer_MapServer_Untiled_getFullRequestString (t) {
+
+        
+        t.plan( 1 );
+        var map = new OpenLayers.Map('map');
+        tUrl = "http://labs.metacarta.com/cgi-bin/mapserv";
+        tParams = { layers: 'basic', 
+                    format: 'png'};
+        var tLayer = new OpenLayers.Layer.MapServer.Untiled(name, tUrl, tParams);
+        map.addLayer(tLayer);
+        str = tLayer.getFullRequestString();
+        var tParams = {
+             layers: 'basic', 
+             format: 'png',
+             mode: 'map',
+             map_imagetype: 'png'
+        };
+
+        var sStr = tUrl + "?" + OpenLayers.Util.getParameterString(tParams);
+        sStr = sStr.replace(/,/g, "+");
+        
+        t.eq(str, sStr , "getFullRequestString() works");
+
+    }
+
+    function test_08_Layer_MapServer_Untiled_setOpacity (t) {
+        t.plan( 4 );
+
+        var map = new OpenLayers.Map('map');
+        map.projection = "xx";
+        tUrl = "http://labs.metacarta.com/cgi-bin/mapserv";
+        tParams = { layers: 'basic', 
+                   format: 'image/png'};
+        tOptions = { 'opacity': '0.5' };           
+        var tLayer = new OpenLayers.Layer.MapServer.Untiled(name, tUrl, tParams, tOptions);
+        map.addLayer(tLayer);
+        map.zoomToMaxExtent();
+        t.eq(tLayer.opacity, "0.5", "Opacity is set correctly");
+        t.eq(parseFloat(tLayer.div.firstChild.firstChild.style.opacity), 0.5, "Opacity on tile is correct");
+        tLayer.setOpacity("0.6");
+        t.eq(tLayer.opacity, "0.6", "setOpacity works properly");
+        t.eq(parseFloat(tLayer.div.firstChild.firstChild.style.opacity), 0.6, "Opacity on tile is changed correctly");
+
+    }    
+    
+    function test_99_Layer_MapServer_Untiled_destroy (t) {
+
+        t.plan( 1 );
+
+        var map = new OpenLayers.Map('map');
+        layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params);
+        map.addLayer(layer);
+
+        map.setCenter(new OpenLayers.LonLat(0,0), 5);
+
+        //grab a reference to one of the tiles
+        var tile = layer.tile;        
+
+        layer.destroy();
+        
+    // checks to make sure superclass (grid) destroy() was called    
+        
+        t.ok( layer.tile == null, "tile set to null");
+    }
+    
+  // -->
   </script>
 </head>
 <body>
diff --git a/tests/Layer/test_MapServer_Untiled.html b/tests/Layer/test_MapServer_Untiled.html
deleted file mode 100644
index cc8e57f0ac..0000000000
--- a/tests/Layer/test_MapServer_Untiled.html
+++ /dev/null
@@ -1,163 +0,0 @@
-<html>
-<head>A
-
-<script src="../../lib/OpenLayers.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', 
-                   Alayers: 'basic'};
-
-    function test_01_Layer_MapServer_Untiled_constructor (t) {
-        t.plan( 4 );
-
-        var url = "http://labs.metacarta.com/cgi-bin/mapserv";
-        layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params);
-        t.ok( layer instanceof OpenLayers.Layer.MapServer.Untiled, "new OpenLayers.Layer.MapServer returns object" );
-        t.eq( layer.url, "http://labs.metacarta.com/cgi-bin/mapserv", "layer.url is correct (HTTPRequest inited)" );
-
-        t.eq( layer.params.mode, "map", "default mode param correctly copied");
-        t.eq( layer.params.map_imagetype, "png", "default imagetype correctly copied");
-
-
-    }
-    
-    function test_04_Layer_MapServer_Untiled_clone (t) {
-        t.plan(3);
-        
-        var url = "http://labs.metacarta.com/cgi-bin/mapserv";
-        var map = new OpenLayers.Map('map', {});
-        layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params);
-        map.addLayer(layer);
-
-        var clone = layer.clone();
-        layer.tile = [[1,2],[3,4]];
-        
-        t.ok( clone.tile != layer.tile, "clone does not copy tile");
-
-        layer.ratio += 1;
-
-        t.eq( clone.ratio, 1, "changing layer.ratio does not change clone.ratio -- a fresh copy was made, not just copied reference");
-
-        t.eq( clone.alpha, layer.alpha, "alpha copied correctly");
-
-        layer.tile = null;
-    }
-
-    function test_05_Layer_MapServer_Untiled_isBaseLayer(t) {
-        t.plan(3);
-        
-        var url = "http://labs.metacarta.com/cgi-bin/mapserv";
-        layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params);
-        t.ok( layer.isBaseLayer, "baselayer is true by default");
-
-        var newParams = OpenLayers.Util.extend({}, params);
-        newParams.transparent = "true";
-        layer = new OpenLayers.Layer.MapServer.Untiled(name, url, newParams);
-        t.ok( !layer.isBaseLayer, "baselayer is false when transparent is set to true");
-
-        layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params, {isBaseLayer: false});
-        t.ok( !layer.isBaseLayer, "baselayer is false when option is set to false" );
-    }
-
-    function test_06_Layer_MapServer_Untiled_mergeNewParams (t) {
-        t.plan( 5 );
-
-        var map = new OpenLayers.Map("map");
-        var url = "http://labs.metacarta.com/cgi-bin/mapserv";
-        layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params);
-        
-        var newParams = { layers: 'sooper', 
-                          chickpeas: 'image/png'};
-
-        map.addLayer(layer);
-        map.zoomToMaxExtent();
-        t.ok( !layer.tile.url.match("chickpeas"), "chickpeas is not in URL of first tile in grid" );
-
-        layer.mergeNewParams(newParams);
-        
-        t.eq( layer.params.layers, "sooper", "mergeNewParams() overwrites well");
-        t.eq( layer.params.chickpeas, "image/png", "mergeNewParams() adds well");
-        t.ok( layer.tile.url.match("chickpeas"), "chickpeas is in URL of first tile in grid" );
-
-        newParams.chickpeas = 151;
-
-        t.eq( layer.params.chickpeas, "image/png", "mergeNewParams() makes clean copy of hashtable");
-    }
-
-    function test_07_Layer_MapServer_Untiled_getFullRequestString (t) {
-
-        
-        t.plan( 1 );
-        var map = new OpenLayers.Map('map');
-        tUrl = "http://labs.metacarta.com/cgi-bin/mapserv";
-        tParams = { layers: 'basic', 
-                    format: 'png'};
-        var tLayer = new OpenLayers.Layer.MapServer.Untiled(name, tUrl, tParams);
-        map.addLayer(tLayer);
-        str = tLayer.getFullRequestString();
-        var tParams = {
-             layers: 'basic', 
-             format: 'png',
-             mode: 'map',
-             map_imagetype: 'png',
-             srs: 'EPSG:4326'
-        };
-
-        var sStr = tUrl + "?" + OpenLayers.Util.getParameterString(tParams);
-        sStr = sStr.replace(/,/g, "+");
-        
-        t.eq(str, sStr , "getFullRequestString() works");
-
-    }
-
-    function test_08_Layer_MapServer_Untiled_setOpacity (t) {
-        t.plan( 4 );
-
-        var map = new OpenLayers.Map('map');
-        map.projection = "xx";
-        tUrl = "http://labs.metacarta.com/cgi-bin/mapserv";
-        tParams = { layers: 'basic', 
-                   format: 'image/png'};
-        tOptions = { 'opacity': '0.5' };           
-        var tLayer = new OpenLayers.Layer.MapServer.Untiled(name, tUrl, tParams, tOptions);
-        map.addLayer(tLayer);
-        map.zoomToMaxExtent();
-        t.eq(tLayer.opacity, "0.5", "Opacity is set correctly");
-        t.eq(parseFloat(tLayer.div.firstChild.firstChild.style.opacity), 0.5, "Opacity on tile is correct");
-        tLayer.setOpacity("0.6");
-        t.eq(tLayer.opacity, "0.6", "setOpacity works properly");
-        t.eq(parseFloat(tLayer.div.firstChild.firstChild.style.opacity), 0.6, "Opacity on tile is changed correctly");
-
-    }    
-    
-    function test_99_Layer_MapServer_Untiled_destroy (t) {
-
-        t.plan( 1 );
-
-        var map = new OpenLayers.Map('map');
-        layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params);
-        map.addLayer(layer);
-
-        map.setCenter(new OpenLayers.LonLat(0,0), 5);
-
-        //grab a reference to one of the tiles
-        var tile = layer.tile;        
-
-        layer.destroy();
-        
-    // checks to make sure superclass (grid) destroy() was called    
-        
-        t.ok( layer.tile == null, "tile set to null");
-    }
-    
-
-  </script>
-</head>
-<body>
-<div id="map" style="width:256px;height:256px"></div>
-</body>
-</html>
diff --git a/tests/list-tests.html b/tests/list-tests.html
index 7889ebb26e..66271b60eb 100644
--- a/tests/list-tests.html
+++ b/tests/list-tests.html
@@ -47,7 +47,6 @@
     <li>Layer/test_Markers.html</li>
     <li>Layer/test_MultiMap.html</li>
     <li>Layer/test_MapServer.html</li>
-    <li>Layer/test_MapServer_Untiled.html</li>
     <li>Layer/test_Text.html</li>
     <li>Layer/test_WMS.html</li>
     <li>Layer/test_WFS.html</li>