diff --git a/spring-core/src/test/java/org/springframework/core/env/DummyEnvironment.java b/spring-core/src/test/java/org/springframework/core/env/DummyEnvironment.java
new file mode 100644
index 0000000000..88d9347dfa
--- /dev/null
+++ b/spring-core/src/test/java/org/springframework/core/env/DummyEnvironment.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.core.env;
+
+public class DummyEnvironment implements Environment {
+
+	public boolean containsProperty(String key) {
+		return false;
+	}
+
+	public String getProperty(String key) {
+		return null;
+	}
+
+	public String getProperty(String key, String defaultValue) {
+		return null;
+	}
+
+	public <T> T getProperty(String key, Class<T> targetType) {
+		return null;
+	}
+
+	public <T> T getProperty(String key, Class<T> targetType, T defaultValue) {
+		return null;
+	}
+
+	public <T> Class<T> getPropertyAsClass(String key, Class<T> targetType) {
+		return null;
+	}
+
+	public String getRequiredProperty(String key) throws IllegalStateException {
+		return null;
+	}
+
+	public <T> T getRequiredProperty(String key, Class<T> targetType)
+			throws IllegalStateException {
+		return null;
+	}
+
+	public String resolvePlaceholders(String text) {
+		return null;
+	}
+
+	public String resolveRequiredPlaceholders(String text)
+			throws IllegalArgumentException {
+		return null;
+	}
+
+	public String[] getActiveProfiles() {
+		return null;
+	}
+
+	public String[] getDefaultProfiles() {
+		return null;
+	}
+
+	public boolean acceptsProfiles(String... profiles) {
+		return false;
+	}
+
+}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java
index 147875e4ca..bb2d0a089b 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java
@@ -16,12 +16,6 @@
 
 package org.springframework.web.servlet;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.CoreMatchers.sameInstance;
-import static org.junit.Assert.assertThat;
-
 import java.io.IOException;
 import java.util.Locale;
 
@@ -36,15 +30,15 @@ import junit.framework.TestCase;
 
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.PropertyValue;
-import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.DefaultMessageSourceResolvable;
 import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.StandardEnvironment;
+import org.springframework.core.env.DummyEnvironment;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
 import org.springframework.mock.web.test.MockServletConfig;
 import org.springframework.mock.web.test.MockServletContext;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.web.bind.EscapedErrors;
 import org.springframework.web.context.ConfigurableWebEnvironment;
 import org.springframework.web.context.ServletConfigAwareBean;
@@ -65,6 +59,9 @@ import org.springframework.web.servlet.theme.AbstractThemeResolver;
 import org.springframework.web.servlet.view.InternalResourceViewResolver;
 import org.springframework.web.util.WebUtils;
 
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
 /**
  * @author Rod Johnson
  * @author Juergen Hoeller
@@ -842,8 +839,8 @@ public class DispatcherServletTests extends TestCase {
 		servlet.setEnvironment(env1); // should succeed
 		assertThat(servlet.getEnvironment(), sameInstance(env1));
 		try {
-			servlet.setEnvironment(new StandardEnvironment());
-			fail("expected exception");
+			servlet.setEnvironment(new DummyEnvironment());
+			fail("expected IllegalArgumentException for non-configurable Environment");
 		}
 		catch (IllegalArgumentException ex) {
 		}