diff --git a/mcs/class/System.Web/Test/System.Web/ChangeLog b/mcs/class/System.Web/Test/System.Web/ChangeLog
index 207e2ebabbd8b..6f8133c618153 100644
--- a/mcs/class/System.Web/Test/System.Web/ChangeLog
+++ b/mcs/class/System.Web/Test/System.Web/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-23 Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* HttpResponseTest.cs: added tests for CacheControl that set it to null
+	and string.Empty.
+
 2006-03-10  Chris Toshok  <toshok@ximian.com>
 
 	* StaticSiteMapProviderTest.cs: new tests.
diff --git a/mcs/class/System.Web/Test/System.Web/HttpResponseTest.cs b/mcs/class/System.Web/Test/System.Web/HttpResponseTest.cs
index 153e821e16ec7..bba378d1fe1c9 100644
--- a/mcs/class/System.Web/Test/System.Web/HttpResponseTest.cs
+++ b/mcs/class/System.Web/Test/System.Web/HttpResponseTest.cs
@@ -337,6 +337,12 @@ public void CacheControl ()
 			
 			c.Response.CacheControl = "no-cache";
 			Assert.AreEqual ("no-cache", c.Response.CacheControl, "D4");
+
+			c.Response.CacheControl = null;
+			Assert.AreEqual ("private", c.Response.CacheControl, "D5");
+
+			c.Response.CacheControl = "";
+			Assert.AreEqual ("private", c.Response.CacheControl, "D6");
 		}
 		
 		//[Test][ExpectedException (typeof (HttpException))]