diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/support/JsonPathExpectationsHelper.java b/spring-test-mvc/src/main/java/org/springframework/test/util/JsonPathExpectationsHelper.java
similarity index 96%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/support/JsonPathExpectationsHelper.java
rename to spring-test-mvc/src/main/java/org/springframework/test/util/JsonPathExpectationsHelper.java
index 60cf32a70d..092b7685a0 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/support/JsonPathExpectationsHelper.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/util/JsonPathExpectationsHelper.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.support;
+package org.springframework.test.util;
 
-import static org.springframework.test.web.mock.AssertionErrors.assertTrue;
+import static org.springframework.test.util.AssertionErrors.assertTrue;
 
 import java.text.ParseException;
 import java.util.List;
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/support/XmlExpectationsHelper.java b/spring-test-mvc/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java
similarity index 94%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/support/XmlExpectationsHelper.java
rename to spring-test-mvc/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java
index 796b75b8ba..f9aed34217 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/support/XmlExpectationsHelper.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.support;
+package org.springframework.test.util;
 
 import java.io.StringReader;
 import java.util.Map;
@@ -28,8 +28,8 @@ import org.custommonkey.xmlunit.Diff;
 import org.custommonkey.xmlunit.XMLUnit;
 import org.hamcrest.Matcher;
 import org.hamcrest.MatcherAssert;
-import org.springframework.test.web.mock.AssertionErrors;
-import org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers;
+import org.springframework.test.util.AssertionErrors;
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.xml.sax.InputSource;
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/support/XpathExpectationsHelper.java b/spring-test-mvc/src/main/java/org/springframework/test/util/XpathExpectationsHelper.java
similarity index 98%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/support/XpathExpectationsHelper.java
rename to spring-test-mvc/src/main/java/org/springframework/test/util/XpathExpectationsHelper.java
index 9a243adfb3..1a52dde283 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/support/XpathExpectationsHelper.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/util/XpathExpectationsHelper.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.support;
+package org.springframework.test.util;
 
-import static org.springframework.test.web.mock.AssertionErrors.assertEquals;
+import static org.springframework.test.util.AssertionErrors.assertEquals;
 
 import java.io.StringReader;
 import java.util.Collections;
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/MockRestServiceServer.java b/spring-test-mvc/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java
similarity index 97%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/MockRestServiceServer.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java
index 1a5942c44c..344599208a 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/MockRestServiceServer.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client;
+package org.springframework.test.web.client;
 
 import java.io.IOException;
 import java.net.URI;
@@ -24,8 +24,8 @@ import java.util.List;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.http.client.ClientHttpRequestFactory;
-import org.springframework.test.web.mock.client.match.MockRestRequestMatchers;
-import org.springframework.test.web.mock.client.response.MockRestResponseCreators;
+import org.springframework.test.web.client.match.MockRestRequestMatchers;
+import org.springframework.test.web.client.response.MockRestResponseCreators;
 import org.springframework.util.Assert;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.client.support.RestGatewaySupport;
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/RequestMatcher.java b/spring-test-mvc/src/main/java/org/springframework/test/web/client/RequestMatcher.java
similarity index 95%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/RequestMatcher.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/client/RequestMatcher.java
index d4b6611d1d..e59d48b5f2 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/RequestMatcher.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/RequestMatcher.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client;
+package org.springframework.test.web.client;
 
 import java.io.IOException;
 
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/RequestMatcherClientHttpRequest.java b/spring-test-mvc/src/main/java/org/springframework/test/web/client/RequestMatcherClientHttpRequest.java
similarity index 98%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/RequestMatcherClientHttpRequest.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/client/RequestMatcherClientHttpRequest.java
index 489f88a869..9a4b4181b0 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/RequestMatcherClientHttpRequest.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/RequestMatcherClientHttpRequest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client;
+package org.springframework.test.web.client;
 
 import java.io.IOException;
 import java.util.LinkedList;
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/ResponseActions.java b/spring-test-mvc/src/main/java/org/springframework/test/web/client/ResponseActions.java
similarity index 95%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/ResponseActions.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/client/ResponseActions.java
index bd31fbfb0c..500e1574b1 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/ResponseActions.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/ResponseActions.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client;
+package org.springframework.test.web.client;
 
 /**
  * A contract for setting up request expectations and defining a response.
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/ResponseCreator.java b/spring-test-mvc/src/main/java/org/springframework/test/web/client/ResponseCreator.java
similarity index 89%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/ResponseCreator.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/client/ResponseCreator.java
index 525e760fa2..6fc6158652 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/ResponseCreator.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/ResponseCreator.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client;
+package org.springframework.test.web.client;
 
 import java.io.IOException;
 
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.http.client.ClientHttpResponse;
-import org.springframework.test.web.mock.client.response.MockRestResponseCreators;
+import org.springframework.test.web.client.response.MockRestResponseCreators;
 
 /**
  * A contract for creating a {@link ClientHttpResponse}.
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/match/ContentRequestMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
similarity index 94%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/match/ContentRequestMatchers.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
index b105b56db8..b8e5134c1d 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/match/ContentRequestMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.match;
+package org.springframework.test.web.client.match;
 
-import static org.springframework.test.web.mock.AssertionErrors.assertEquals;
-import static org.springframework.test.web.mock.AssertionErrors.assertTrue;
+import static org.springframework.test.util.AssertionErrors.assertEquals;
+import static org.springframework.test.util.AssertionErrors.assertTrue;
 
 import java.io.IOException;
 
@@ -29,8 +29,8 @@ import org.hamcrest.Matchers;
 import org.springframework.http.MediaType;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.mock.http.client.MockClientHttpRequest;
-import org.springframework.test.web.mock.client.RequestMatcher;
-import org.springframework.test.web.mock.support.XmlExpectationsHelper;
+import org.springframework.test.util.XmlExpectationsHelper;
+import org.springframework.test.web.client.RequestMatcher;
 import org.w3c.dom.Node;
 
 /**
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/match/JsonPathRequestMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/JsonPathRequestMatchers.java
similarity index 95%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/match/JsonPathRequestMatchers.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/client/match/JsonPathRequestMatchers.java
index 0fa6722fdc..e81ab4d4bf 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/match/JsonPathRequestMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/JsonPathRequestMatchers.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.match;
+package org.springframework.test.web.client.match;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.instanceOf;
@@ -25,8 +25,8 @@ import java.util.List;
 import org.hamcrest.Matcher;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.mock.http.client.MockClientHttpRequest;
-import org.springframework.test.web.mock.client.RequestMatcher;
-import org.springframework.test.web.mock.support.JsonPathExpectationsHelper;
+import org.springframework.test.util.JsonPathExpectationsHelper;
+import org.springframework.test.web.client.RequestMatcher;
 
 /**
  * Factory methods for request content {@code RequestMatcher}'s using a <a
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/match/MockRestRequestMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java
similarity index 96%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/match/MockRestRequestMatchers.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java
index ae4aea7441..5bb83fd844 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/match/MockRestRequestMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.match;
+package org.springframework.test.web.client.match;
 
 import java.io.IOException;
 import java.net.URI;
@@ -30,9 +30,9 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.mock.http.client.MockClientHttpRequest;
-import org.springframework.test.web.mock.AssertionErrors;
-import org.springframework.test.web.mock.client.MockRestServiceServer;
-import org.springframework.test.web.mock.client.RequestMatcher;
+import org.springframework.test.util.AssertionErrors;
+import org.springframework.test.web.client.MockRestServiceServer;
+import org.springframework.test.web.client.RequestMatcher;
 import org.springframework.util.Assert;
 
 /**
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/match/XpathRequestMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/XpathRequestMatchers.java
similarity index 96%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/match/XpathRequestMatchers.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/client/match/XpathRequestMatchers.java
index 0b2255b1a4..c1458c122c 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/match/XpathRequestMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/XpathRequestMatchers.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.match;
+package org.springframework.test.web.client.match;
 
 import java.io.IOException;
 import java.util.Map;
@@ -24,8 +24,8 @@ import org.hamcrest.Matcher;
 import org.hamcrest.Matchers;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.mock.http.client.MockClientHttpRequest;
-import org.springframework.test.web.mock.client.RequestMatcher;
-import org.springframework.test.web.mock.support.XpathExpectationsHelper;
+import org.springframework.test.util.XpathExpectationsHelper;
+import org.springframework.test.web.client.RequestMatcher;
 import org.w3c.dom.Node;
 
 /**
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/match/package-info.java b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/package-info.java
similarity index 76%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/match/package-info.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/client/match/package-info.java
index 55ad8f4f2f..97580e521e 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/match/package-info.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/package-info.java
@@ -15,9 +15,9 @@
  */
 
 /**
- * Contains built-in {@link org.springframework.test.web.mock.client.RequestMatcher}
+ * Contains built-in {@link org.springframework.test.web.client.RequestMatcher}
  * implementations. Use
- * {@link org.springframework.test.web.mock.client.match.MockRestRequestMatchers}
+ * {@link org.springframework.test.web.client.match.MockRestRequestMatchers}
  * to gain access to instances of those implementations.
  */
-package org.springframework.test.web.mock.client.match;
+package org.springframework.test.web.client.match;
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/package-info.java b/spring-test-mvc/src/main/java/org/springframework/test/web/client/package-info.java
similarity index 84%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/package-info.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/client/package-info.java
index 0c2703aaa1..2b72469c44 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/package-info.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/package-info.java
@@ -16,6 +16,6 @@
 
 /**
  * Contains client-side REST testing support.
- * @see org.springframework.test.web.mock.client.MockRestServiceServer
+ * @see org.springframework.test.web.client.MockRestServiceServer
  */
-package org.springframework.test.web.mock.client;
+package org.springframework.test.web.client;
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/response/DefaultResponseCreator.java b/spring-test-mvc/src/main/java/org/springframework/test/web/client/response/DefaultResponseCreator.java
similarity index 96%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/response/DefaultResponseCreator.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/client/response/DefaultResponseCreator.java
index 79cb215b5c..7518f14f64 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/response/DefaultResponseCreator.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/response/DefaultResponseCreator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.response;
+package org.springframework.test.web.client.response;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -27,7 +27,7 @@ import org.springframework.http.MediaType;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.mock.http.client.MockClientHttpResponse;
-import org.springframework.test.web.mock.client.ResponseCreator;
+import org.springframework.test.web.client.ResponseCreator;
 import org.springframework.util.Assert;
 
 /**
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/response/MockRestResponseCreators.java b/spring-test-mvc/src/main/java/org/springframework/test/web/client/response/MockRestResponseCreators.java
similarity index 96%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/response/MockRestResponseCreators.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/client/response/MockRestResponseCreators.java
index 27af73a079..088d2560dc 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/response/MockRestResponseCreators.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/response/MockRestResponseCreators.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.response;
+package org.springframework.test.web.client.response;
 
 import java.io.IOException;
 import java.net.URI;
@@ -24,7 +24,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.mock.http.client.MockClientHttpResponse;
-import org.springframework.test.web.mock.client.ResponseCreator;
+import org.springframework.test.web.client.ResponseCreator;
 
 /**
  * Static factory methods for obtaining a {@link ResponseCreator} instance.
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/package-info.java b/spring-test-mvc/src/main/java/org/springframework/test/web/client/response/package-info.java
similarity index 75%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/package-info.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/client/response/package-info.java
index b1b203db0a..50c39d24bb 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/package-info.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/response/package-info.java
@@ -15,9 +15,9 @@
  */
 
 /**
- * Contains built-in {@link org.springframework.test.web.mock.servlet.RequestBuilder}
+ * Contains built-in {@link org.springframework.test.web.client.ResponseCreator}
  * implementations. Use
- * {@link org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders}
+ * {@link org.springframework.test.web.client.response.MockRestResponseCreators}
  * to gain access to instances of those implementations.
  */
-package org.springframework.test.web.mock.servlet.request;
+package org.springframework.test.web.client.response;
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/support/package-info.java b/spring-test-mvc/src/main/java/org/springframework/test/web/mock/support/package-info.java
deleted file mode 100644
index e778adb754..0000000000
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/support/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2002-2012 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.
- */
-
-/**
- * Support classes shared among client and server-side Spring MVC Test classes.
- */
-package org.springframework.test.web.mock.support;
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/DefaultMvcResult.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/DefaultMvcResult.java
similarity index 98%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/DefaultMvcResult.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/DefaultMvcResult.java
index 391dd90bc1..fa76bd8179 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/DefaultMvcResult.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/DefaultMvcResult.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.servlet;
+package org.springframework.test.web.servlet;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/MockMvc.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvc.java
similarity index 87%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/MockMvc.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvc.java
index 9feb7cb1d2..a074ff6d14 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/MockMvc.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvc.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet;
+package org.springframework.test.web.servlet;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -67,7 +67,7 @@ public final class MockMvc {
 
 	/**
 	 * Private constructor, not for direct instantiation.
-	 * @see org.springframework.test.web.mock.servlet.setup.MockMvcBuilders
+	 * @see org.springframework.test.web.servlet.setup.MockMvcBuilders
 	 */
 	MockMvc(MockFilterChain filterChain, ServletContext servletContext) {
 		Assert.notNull(servletContext, "A ServletContext is required");
@@ -79,7 +79,7 @@ public final class MockMvc {
 
 	/**
 	 * A default request builder merged into every performed request.
-	 * @see org.springframework.test.web.mock.servlet.setup.DefaultMockMvcBuilder#defaultRequest(RequestBuilder)
+	 * @see org.springframework.test.web.servlet.setup.DefaultMockMvcBuilder#defaultRequest(RequestBuilder)
 	 */
 	void setDefaultRequest(RequestBuilder requestBuilder) {
 		this.defaultRequestBuilder = requestBuilder;
@@ -87,7 +87,7 @@ public final class MockMvc {
 
 	/**
 	 * Expectations to assert after every performed request.
-	 * @see org.springframework.test.web.mock.servlet.setup.DefaultMockMvcBuilder#alwaysExpect(ResultMatcher)
+	 * @see org.springframework.test.web.servlet.setup.DefaultMockMvcBuilder#alwaysExpect(ResultMatcher)
 	 */
 	void setGlobalResultMatchers(List<ResultMatcher> resultMatchers) {
 		Assert.notNull(resultMatchers, "resultMatchers is required");
@@ -96,7 +96,7 @@ public final class MockMvc {
 
 	/**
 	 * General actions to apply after every performed request.
-	 * @see org.springframework.test.web.mock.servlet.setup.DefaultMockMvcBuilder#alwaysDo(ResultHandler)
+	 * @see org.springframework.test.web.servlet.setup.DefaultMockMvcBuilder#alwaysDo(ResultHandler)
 	 */
 	void setGlobalResultHandlers(List<ResultHandler> resultHandlers) {
 		Assert.notNull(resultHandlers, "resultHandlers is required");
@@ -109,12 +109,12 @@ public final class MockMvc {
 	 *
 	 * @param requestBuilder used to prepare the request to execute;
 	 * see static factory methods in
-	 * {@link org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders}
+	 * {@link org.springframework.test.web.servlet.request.MockMvcRequestBuilders}
 	 *
 	 * @return an instance of {@link ResultActions}; never {@code null}
 	 *
-	 * @see org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders
-	 * @see org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers
+	 * @see org.springframework.test.web.servlet.request.MockMvcRequestBuilders
+	 * @see org.springframework.test.web.servlet.result.MockMvcResultMatchers
 	 */
 	public ResultActions perform(RequestBuilder requestBuilder) throws Exception {
 
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/MockMvcBuilder.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvcBuilder.java
similarity index 94%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/MockMvcBuilder.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvcBuilder.java
index d971366f00..2e120b9a94 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/MockMvcBuilder.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvcBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet;
+package org.springframework.test.web.servlet;
 
 /**
  * Builds a {@link MockMvc}.
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/MockMvcBuilderSupport.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvcBuilderSupport.java
similarity index 94%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/MockMvcBuilderSupport.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvcBuilderSupport.java
index 0a7431be1b..75a50db9df 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/MockMvcBuilderSupport.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvcBuilderSupport.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet;
+package org.springframework.test.web.servlet;
 
 import java.util.List;
 
@@ -31,7 +31,7 @@ import org.springframework.web.context.WebApplicationContext;
  * Base class for MockMvc builder implementations, providing the capability to
  * create a {@link MockMvc} instance.
  *
- * <p>{@link org.springframework.test.web.mock.servlet.setup.DefaultMockMvcBuilder},
+ * <p>{@link org.springframework.test.web.servlet.setup.DefaultMockMvcBuilder},
  * which derives from this class, provides a concrete {@code build} method,
  * and delegates to abstract methods to obtain a {@link WebApplicationContext}.
  *
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/MvcResult.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MvcResult.java
similarity index 97%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/MvcResult.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MvcResult.java
index 49c0b990c4..88e11dda3e 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/MvcResult.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MvcResult.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet;
+package org.springframework.test.web.servlet;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/RequestBuilder.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/RequestBuilder.java
similarity index 92%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/RequestBuilder.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/RequestBuilder.java
index ee11266b02..17d9290c7b 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/RequestBuilder.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/RequestBuilder.java
@@ -1,4 +1,4 @@
-package org.springframework.test.web.mock.servlet;
+package org.springframework.test.web.servlet;
 
 import javax.servlet.ServletContext;
 
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/ResultActions.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultActions.java
similarity index 97%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/ResultActions.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultActions.java
index 59ea5d4770..d94e8c7a15 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/ResultActions.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultActions.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet;
+package org.springframework.test.web.servlet;
 
 /**
  * Allows applying actions, such as expectations, on the result of an executed
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/ResultHandler.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultHandler.java
similarity index 96%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/ResultHandler.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultHandler.java
index 75b38fb687..b0ab9ca902 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/ResultHandler.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet;
+package org.springframework.test.web.servlet;
 
 /**
  * Executes a generic action (e.g. printing debug information) on the result of
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/ResultMatcher.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
similarity index 96%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/ResultMatcher.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
index 7a44bf35f2..f50a6d21bf 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/ResultMatcher.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet;
+package org.springframework.test.web.servlet;
 
 /**
  * Matches the result of an executed request against some expectation.
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/TestDispatcherServlet.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/TestDispatcherServlet.java
similarity index 99%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/TestDispatcherServlet.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/TestDispatcherServlet.java
index 5e4b18db7f..27f14ce150 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/TestDispatcherServlet.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/TestDispatcherServlet.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet;
+package org.springframework.test.web.servlet;
 
 import java.io.IOException;
 import java.util.concurrent.Callable;
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/package-info.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/package-info.java
similarity index 86%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/package-info.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/package-info.java
index a90823f396..9eb203dd81 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/package-info.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/package-info.java
@@ -16,6 +16,6 @@
 
 /**
  * Contains server-side support for testing Spring MVC applications.
- * @see org.springframework.test.web.mock.servlet.MockMvc
+ * @see org.springframework.test.web.servlet.MockMvc
  */
-package org.springframework.test.web.mock.servlet;
+package org.springframework.test.web.servlet;
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/MockAsyncContext.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockAsyncContext.java
similarity index 98%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/MockAsyncContext.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockAsyncContext.java
index f5cec81e81..c13ad69a82 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/MockAsyncContext.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockAsyncContext.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.servlet.request;
+package org.springframework.test.web.servlet.request;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/MockHttpServletRequestBuilder.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
similarity index 98%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/MockHttpServletRequestBuilder.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
index c1f8521e1e..fd2847bf46 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/MockHttpServletRequestBuilder.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.request;
+package org.springframework.test.web.servlet.request;
 
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Constructor;
@@ -40,9 +40,9 @@ import org.springframework.http.MediaType;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.mock.web.MockHttpSession;
-import org.springframework.test.web.mock.servlet.MockMvc;
-import org.springframework.test.web.mock.servlet.RequestBuilder;
-import org.springframework.test.web.mock.servlet.setup.MockMvcBuilders;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.RequestBuilder;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.LinkedMultiValueMap;
@@ -653,7 +653,7 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable
 
 	private MockHttpServletRequest createServlet3Request(ServletContext servletContext) {
 		try {
-			String className = "org.springframework.test.web.mock.servlet.request.Servlet3MockHttpServletRequest";
+			String className = "org.springframework.test.web.servlet.request.Servlet3MockHttpServletRequest";
 			Class<?> clazz = ClassUtils.forName(className, MockHttpServletRequestBuilder.class.getClassLoader());
 			Constructor<?> constructor = clazz.getConstructor(ServletContext.class);
 			return (MockHttpServletRequest) BeanUtils.instantiateClass(constructor, servletContext);
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/MockMultipartHttpServletRequestBuilder.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java
similarity index 95%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/MockMultipartHttpServletRequestBuilder.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java
index 1d4a665669..ec9c7f5dbb 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/MockMultipartHttpServletRequestBuilder.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.request;
+package org.springframework.test.web.servlet.request;
 
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
@@ -110,7 +110,7 @@ public class MockMultipartHttpServletRequestBuilder extends MockHttpServletReque
 
 	private MockMultipartHttpServletRequest createServlet3Request() {
 		try {
-			String className = "org.springframework.test.web.mock.servlet.request.Servlet3MockMultipartHttpServletRequest";
+			String className = "org.springframework.test.web.servlet.request.Servlet3MockMultipartHttpServletRequest";
 			Class<?> clazz = ClassUtils.forName(className, MockMultipartHttpServletRequestBuilder.class.getClassLoader());
 			Constructor<?> constructor = clazz.getDeclaredConstructor();
 			return (MockMultipartHttpServletRequest) BeanUtils.instantiateClass(constructor);
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/MockMvcRequestBuilders.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java
similarity index 96%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/MockMvcRequestBuilders.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java
index 77cc92390b..b812ad2d9d 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/MockMvcRequestBuilders.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.servlet.request;
+package org.springframework.test.web.servlet.request;
 
 import org.springframework.http.HttpMethod;
-import org.springframework.test.web.mock.servlet.RequestBuilder;
+import org.springframework.test.web.servlet.RequestBuilder;
 
 /**
  * Static factory methods for {@link RequestBuilder}s.
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/RequestPostProcessor.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/RequestPostProcessor.java
similarity index 96%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/RequestPostProcessor.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/RequestPostProcessor.java
index cd780b6d21..cb2322e636 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/RequestPostProcessor.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/RequestPostProcessor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.servlet.request;
+package org.springframework.test.web.servlet.request;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/Servlet3MockHttpServletRequest.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/Servlet3MockHttpServletRequest.java
similarity index 97%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/Servlet3MockHttpServletRequest.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/Servlet3MockHttpServletRequest.java
index 618cf93897..ec4fafd59a 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/Servlet3MockHttpServletRequest.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/Servlet3MockHttpServletRequest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.servlet.request;
+package org.springframework.test.web.servlet.request;
 
 import java.io.IOException;
 import java.util.Collection;
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/Servlet3MockMultipartHttpServletRequest.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/Servlet3MockMultipartHttpServletRequest.java
similarity index 97%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/Servlet3MockMultipartHttpServletRequest.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/Servlet3MockMultipartHttpServletRequest.java
index 7d60aa4434..ef27070151 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/Servlet3MockMultipartHttpServletRequest.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/Servlet3MockMultipartHttpServletRequest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.servlet.request;
+package org.springframework.test.web.servlet.request;
 
 import java.io.IOException;
 import java.util.Collection;
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/response/package-info.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/package-info.java
similarity index 75%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/response/package-info.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/package-info.java
index ac2585d6e3..6573d9033a 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/response/package-info.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/package-info.java
@@ -15,9 +15,9 @@
  */
 
 /**
- * Contains built-in {@link org.springframework.test.web.mock.client.ResponseCreator}
+ * Contains built-in {@link org.springframework.test.web.servlet.RequestBuilder}
  * implementations. Use
- * {@link org.springframework.test.web.mock.client.response.MockRestResponseCreators}
+ * {@link org.springframework.test.web.servlet.request.MockMvcRequestBuilders}
  * to gain access to instances of those implementations.
  */
-package org.springframework.test.web.mock.client.response;
+package org.springframework.test.web.servlet.request;
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/ContentResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
similarity index 92%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/ContentResultMatchers.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
index f499ce2522..d76284d800 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/ContentResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
-import static org.springframework.test.web.mock.AssertionErrors.assertEquals;
-import static org.springframework.test.web.mock.AssertionErrors.assertTrue;
+import static org.springframework.test.util.AssertionErrors.assertEquals;
+import static org.springframework.test.util.AssertionErrors.assertTrue;
 
 import java.util.Map;
 
@@ -29,9 +29,9 @@ import org.hamcrest.Matcher;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.springframework.http.MediaType;
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.ResultMatcher;
-import org.springframework.test.web.mock.support.XmlExpectationsHelper;
+import org.springframework.test.util.XmlExpectationsHelper;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultMatcher;
 import org.w3c.dom.Node;
 
 /**
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/CookieResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/CookieResultMatchers.java
similarity index 94%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/CookieResultMatchers.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/CookieResultMatchers.java
index 1c6b81225a..5d00077acf 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/CookieResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/CookieResultMatchers.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
-import static org.springframework.test.web.mock.AssertionErrors.assertEquals;
-import static org.springframework.test.web.mock.AssertionErrors.assertTrue;
+import static org.springframework.test.util.AssertionErrors.assertEquals;
+import static org.springframework.test.util.AssertionErrors.assertTrue;
 
 import javax.servlet.http.Cookie;
 
 import org.hamcrest.Matcher;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.ResultMatcher;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultMatcher;
 
 /**
  * Factory for response cookie assertions. An instance of this class is
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/FlashAttributeResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchers.java
similarity index 90%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/FlashAttributeResultMatchers.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchers.java
index 8408bb30fb..191be8485f 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/FlashAttributeResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchers.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
-import static org.springframework.test.web.mock.AssertionErrors.*;
+import static org.springframework.test.util.AssertionErrors.*;
 
 import org.hamcrest.Matcher;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.ResultMatcher;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultMatcher;
 
 /**
  * Factory for "output" flash attribute assertions. An instance of this class is
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/HandlerResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/HandlerResultMatchers.java
similarity index 91%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/HandlerResultMatchers.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/HandlerResultMatchers.java
index f0f67c9530..a01488dcae 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/HandlerResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/HandlerResultMatchers.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
-import static org.springframework.test.web.mock.AssertionErrors.assertEquals;
-import static org.springframework.test.web.mock.AssertionErrors.assertTrue;
+import static org.springframework.test.util.AssertionErrors.assertEquals;
+import static org.springframework.test.util.AssertionErrors.assertTrue;
 
 import java.lang.reflect.Method;
 
 import org.hamcrest.Matcher;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.ResultMatcher;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultMatcher;
 import org.springframework.util.ClassUtils;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/HeaderResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/HeaderResultMatchers.java
similarity index 88%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/HeaderResultMatchers.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/HeaderResultMatchers.java
index cb8f12801c..51e2e3a044 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/HeaderResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/HeaderResultMatchers.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
-import static org.springframework.test.web.mock.AssertionErrors.assertEquals;
+import static org.springframework.test.util.AssertionErrors.assertEquals;
 
 import org.hamcrest.Matcher;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.ResultMatcher;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultMatcher;
 
 /**
  * Factory for response header assertions. An instance of this
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/JsonPathResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/JsonPathResultMatchers.java
similarity index 91%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/JsonPathResultMatchers.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/JsonPathResultMatchers.java
index be3929e599..81b8c1b665 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/JsonPathResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/JsonPathResultMatchers.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.instanceOf;
@@ -22,9 +22,9 @@ import static org.hamcrest.Matchers.instanceOf;
 import java.util.List;
 
 import org.hamcrest.Matcher;
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.ResultMatcher;
-import org.springframework.test.web.mock.support.JsonPathExpectationsHelper;
+import org.springframework.test.util.JsonPathExpectationsHelper;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultMatcher;
 
 /**
  * Factory for assertions on the response content using <a
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/MockMvcResultHandlers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultHandlers.java
similarity index 91%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/MockMvcResultHandlers.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultHandlers.java
index 572d9157f7..cb491c9537 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/MockMvcResultHandlers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultHandlers.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.ResultHandler;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultHandler;
 import org.springframework.util.CollectionUtils;
 
 /**
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/MockMvcResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultMatchers.java
similarity index 95%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/MockMvcResultMatchers.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultMatchers.java
index 6d7a9fee19..fb34c36ffd 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/MockMvcResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultMatchers.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
-import static org.springframework.test.web.mock.AssertionErrors.assertEquals;
+import static org.springframework.test.util.AssertionErrors.assertEquals;
 
 import java.util.Map;
 
 import javax.xml.xpath.XPathExpressionException;
 
 import org.hamcrest.Matcher;
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.ResultMatcher;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultMatcher;
 
 /**
  * Static, factory methods for {@link ResultMatcher}-based result actions.
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/ModelResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ModelResultMatchers.java
similarity index 95%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/ModelResultMatchers.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ModelResultMatchers.java
index f47d1b39cd..3d79b7e7c2 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/ModelResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ModelResultMatchers.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
-import static org.springframework.test.web.mock.AssertionErrors.assertEquals;
-import static org.springframework.test.web.mock.AssertionErrors.assertTrue;
+import static org.springframework.test.util.AssertionErrors.assertEquals;
+import static org.springframework.test.util.AssertionErrors.assertTrue;
 
 import org.hamcrest.Matcher;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.ResultMatcher;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultMatcher;
 import org.springframework.ui.ModelMap;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.Errors;
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/PrintingResultHandler.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java
similarity index 97%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/PrintingResultHandler.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java
index 9c21cfe5a8..73a67ce8bb 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/PrintingResultHandler.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
 import java.util.Enumeration;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.ResultHandler;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultHandler;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.Errors;
 import org.springframework.web.method.HandlerMethod;
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/RequestResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/RequestResultMatchers.java
similarity index 96%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/RequestResultMatchers.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/RequestResultMatchers.java
index 5bc401583f..468060f80d 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/RequestResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/RequestResultMatchers.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
 import static org.hamcrest.Matchers.equalTo;
 
@@ -26,8 +26,8 @@ import org.hamcrest.Matcher;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.springframework.mock.web.MockHttpServletRequest;
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.ResultMatcher;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultMatcher;
 import org.springframework.web.context.request.async.AsyncTask;
 import org.springframework.web.context.request.async.DeferredResult;
 import org.springframework.web.context.request.async.WebAsyncManager;
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/StatusResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java
similarity index 98%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/StatusResultMatchers.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java
index 23f133896a..370c838b11 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/StatusResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
-import static org.springframework.test.web.mock.AssertionErrors.assertEquals;
+import static org.springframework.test.util.AssertionErrors.assertEquals;
 
 import org.hamcrest.Matcher;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.springframework.http.HttpStatus;
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.ResultMatcher;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultMatcher;
 
 /**
  * Factory for assertions on the response status. An instance of this class is
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/ViewResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ViewResultMatchers.java
similarity index 86%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/ViewResultMatchers.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ViewResultMatchers.java
index 76c095ad92..454ea4d03d 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/ViewResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ViewResultMatchers.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
-import static org.springframework.test.web.mock.AssertionErrors.assertTrue;
+import static org.springframework.test.util.AssertionErrors.assertTrue;
 
 import org.hamcrest.Matcher;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.ResultMatcher;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultMatcher;
 import org.springframework.web.servlet.ModelAndView;
 
 /**
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/XpathResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/XpathResultMatchers.java
similarity index 94%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/XpathResultMatchers.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/XpathResultMatchers.java
index fa2e92ba9e..4079960e1b 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/XpathResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/XpathResultMatchers.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
 import java.util.Map;
 
@@ -22,9 +22,9 @@ import javax.xml.xpath.XPathExpressionException;
 
 import org.hamcrest.Matcher;
 import org.hamcrest.Matchers;
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.ResultMatcher;
-import org.springframework.test.web.mock.support.XpathExpectationsHelper;
+import org.springframework.test.util.XpathExpectationsHelper;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultMatcher;
 import org.w3c.dom.Node;
 
 /**
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/package-info.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/package-info.java
similarity index 76%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/package-info.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/package-info.java
index d57e56214a..b4b9a81534 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/package-info.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/package-info.java
@@ -16,8 +16,8 @@
 
 /**
  * Contains built-in {@code ResultMatcher} and {@code ResultHandler} implementations.
- * Use {@link org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers}
- * and {@link org.springframework.test.web.mock.servlet.result.MockMvcResultHandlers}
+ * Use {@link org.springframework.test.web.servlet.result.MockMvcResultMatchers}
+ * and {@link org.springframework.test.web.servlet.result.MockMvcResultHandlers}
  * to access to instances of those implementations.
  */
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/setup/DefaultMockMvcBuilder.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilder.java
similarity index 90%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/setup/DefaultMockMvcBuilder.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilder.java
index 8a7fede5b4..37e7a531b4 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/setup/DefaultMockMvcBuilder.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.setup;
+package org.springframework.test.web.servlet.setup;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,12 +23,12 @@ import javax.servlet.Filter;
 import javax.servlet.ServletContext;
 
 import org.springframework.mock.web.MockServletConfig;
-import org.springframework.test.web.mock.servlet.MockMvc;
-import org.springframework.test.web.mock.servlet.MockMvcBuilder;
-import org.springframework.test.web.mock.servlet.MockMvcBuilderSupport;
-import org.springframework.test.web.mock.servlet.RequestBuilder;
-import org.springframework.test.web.mock.servlet.ResultHandler;
-import org.springframework.test.web.mock.servlet.ResultMatcher;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.MockMvcBuilder;
+import org.springframework.test.web.servlet.MockMvcBuilderSupport;
+import org.springframework.test.web.servlet.RequestBuilder;
+import org.springframework.test.web.servlet.ResultHandler;
+import org.springframework.test.web.servlet.ResultMatcher;
 import org.springframework.util.Assert;
 import org.springframework.web.context.WebApplicationContext;
 
@@ -142,7 +142,7 @@ public class DefaultMockMvcBuilder<Self extends MockMvcBuilder> extends MockMvcB
 	 * default properties defined here.
 	 *
 	 * @param requestBuilder a RequestBuilder; see static factory methods in
-	 * {@link org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders}
+	 * {@link org.springframework.test.web.servlet.request.MockMvcRequestBuilders}
 	 * .
 	 */
 	@SuppressWarnings("unchecked")
@@ -157,7 +157,7 @@ public class DefaultMockMvcBuilder<Self extends MockMvcBuilder> extends MockMvcB
 	 * {@code "application/json"}, etc.
 	 *
 	 * @param resultMatcher a ResultMatcher; see static factory methods in
-	 * {@link org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers}
+	 * {@link org.springframework.test.web.servlet.result.MockMvcResultMatchers}
 	 */
 	@SuppressWarnings("unchecked")
 	public final <T extends Self> T alwaysExpect(ResultMatcher resultMatcher) {
@@ -171,7 +171,7 @@ public class DefaultMockMvcBuilder<Self extends MockMvcBuilder> extends MockMvcB
 	 * request and resulting response to {@code System.out}.
 	 *
 	 * @param resultHandler a ResultHandler; see static factory methods in
-	 * {@link org.springframework.test.web.mock.servlet.result.MockMvcResultHandlers}
+	 * {@link org.springframework.test.web.servlet.result.MockMvcResultHandlers}
 	 */
 	@SuppressWarnings("unchecked")
 	public final <T extends Self> T alwaysDo(ResultHandler resultHandler) {
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/setup/MockMvcBuilders.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/MockMvcBuilders.java
similarity index 94%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/setup/MockMvcBuilders.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/MockMvcBuilders.java
index b717acc6ad..b171f6b43b 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/setup/MockMvcBuilders.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/MockMvcBuilders.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.setup;
+package org.springframework.test.web.servlet.setup;
 
 import javax.servlet.ServletContext;
 
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.servlet.MockMvc;
-import org.springframework.test.web.mock.servlet.MockMvcBuilder;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.MockMvcBuilder;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.DispatcherServlet;
 
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/setup/PatternMappingFilterProxy.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/PatternMappingFilterProxy.java
similarity index 98%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/setup/PatternMappingFilterProxy.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/PatternMappingFilterProxy.java
index 85ca1ff089..fbec16420d 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/setup/PatternMappingFilterProxy.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/PatternMappingFilterProxy.java
@@ -10,7 +10,7 @@
  * 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.test.web.mock.servlet.setup;
+package org.springframework.test.web.servlet.setup;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/setup/StandaloneMockMvcBuilder.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
similarity index 99%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/setup/StandaloneMockMvcBuilder.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
index cb42aef30e..2ce0bc35fc 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/setup/StandaloneMockMvcBuilder.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.setup;
+package org.springframework.test.web.servlet.setup;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/setup/StubWebApplicationContext.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java
similarity index 99%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/setup/StubWebApplicationContext.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java
index 9f58a6032e..2856d586cd 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/setup/StubWebApplicationContext.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.setup;
+package org.springframework.test.web.servlet.setup;
 
 import java.io.IOException;
 import java.lang.annotation.Annotation;
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/setup/package-info.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/package-info.java
similarity index 84%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/setup/package-info.java
rename to spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/package-info.java
index 0050912470..5ea9339dde 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/setup/package-info.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/package-info.java
@@ -16,7 +16,7 @@
 
 /**
  * Contains built-in {@code MockMvcBuilder} implementations.
- * Use {@link org.springframework.test.web.mock.servlet.setup.MockMvcBuilders}
+ * Use {@link org.springframework.test.web.servlet.setup.MockMvcBuilders}
  * to access to instances of those implementations.
  */
-package org.springframework.test.web.mock.servlet.setup;
+package org.springframework.test.web.servlet.setup;
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/Person.java b/spring-test-mvc/src/test/java/org/springframework/test/web/Person.java
similarity index 97%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/Person.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/Person.java
index 404e7710fb..53ef980ee2 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/Person.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/Person.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock;
+package org.springframework.test.web;
 
 import javax.validation.constraints.NotNull;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/MockClientHttpRequestFactoryTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/client/MockClientHttpRequestFactoryTests.java
similarity index 92%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/MockClientHttpRequestFactoryTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/client/MockClientHttpRequestFactoryTests.java
index ce857fb477..ef4b4957a6 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/MockClientHttpRequestFactoryTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/client/MockClientHttpRequestFactoryTests.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client;
+package org.springframework.test.web.client;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
-import static org.springframework.test.web.mock.client.match.MockRestRequestMatchers.anything;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.anything;
 
 import java.net.URI;
 
@@ -27,7 +27,7 @@ import org.junit.Test;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.http.client.ClientHttpRequestFactory;
-import org.springframework.test.web.mock.client.MockRestServiceServer;
+import org.springframework.test.web.client.MockRestServiceServer;
 import org.springframework.web.client.RestTemplate;
 
 /**
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/match/ContentRequestMatchersTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/client/match/ContentRequestMatchersTests.java
similarity index 94%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/match/ContentRequestMatchersTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/client/match/ContentRequestMatchersTests.java
index e8f79171b3..6e0e708a40 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/match/ContentRequestMatchersTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/client/match/ContentRequestMatchersTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.match;
+package org.springframework.test.web.client.match;
 
 import static org.hamcrest.Matchers.hasXPath;
 
@@ -21,8 +21,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.http.MediaType;
 import org.springframework.mock.http.client.MockClientHttpRequest;
-import org.springframework.test.web.mock.client.match.ContentRequestMatchers;
-import org.springframework.test.web.mock.client.match.MockRestRequestMatchers;
+import org.springframework.test.web.client.match.ContentRequestMatchers;
+import org.springframework.test.web.client.match.MockRestRequestMatchers;
 
 /**
  * Tests for {@link ContentRequestMatchers}.
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/match/JsonPathRequestMatchersTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/client/match/JsonPathRequestMatchersTests.java
similarity index 95%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/match/JsonPathRequestMatchersTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/client/match/JsonPathRequestMatchersTests.java
index 21e1dc2f14..f355fe7183 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/match/JsonPathRequestMatchersTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/client/match/JsonPathRequestMatchersTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.match;
+package org.springframework.test.web.client.match;
 
 import java.io.IOException;
 
@@ -21,7 +21,7 @@ import org.hamcrest.Matchers;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.mock.http.client.MockClientHttpRequest;
-import org.springframework.test.web.mock.client.match.JsonPathRequestMatchers;
+import org.springframework.test.web.client.match.JsonPathRequestMatchers;
 
 /**
  * Tests for {@link JsonPathRequestMatchers}.
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/match/RequestMatchersTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/client/match/RequestMatchersTests.java
similarity index 96%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/match/RequestMatchersTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/client/match/RequestMatchersTests.java
index 2c3d61320d..fa48dea164 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/match/RequestMatchersTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/client/match/RequestMatchersTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.match;
+package org.springframework.test.web.client.match;
 
 import static org.hamcrest.Matchers.containsString;
 
@@ -24,7 +24,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.http.HttpMethod;
 import org.springframework.mock.http.client.MockClientHttpRequest;
-import org.springframework.test.web.mock.client.match.MockRestRequestMatchers;
+import org.springframework.test.web.client.match.MockRestRequestMatchers;
 
 /**
  * Tests for {@link MockRestRequestMatchers}.
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/match/XpathRequestMatchersTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/client/match/XpathRequestMatchersTests.java
similarity index 96%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/match/XpathRequestMatchersTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/client/match/XpathRequestMatchersTests.java
index 395d4f031f..dd7205730c 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/match/XpathRequestMatchersTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/client/match/XpathRequestMatchersTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.match;
+package org.springframework.test.web.client.match;
 
 import java.io.IOException;
 
@@ -21,7 +21,7 @@ import org.hamcrest.Matchers;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.mock.http.client.MockClientHttpRequest;
-import org.springframework.test.web.mock.client.match.XpathRequestMatchers;
+import org.springframework.test.web.client.match.XpathRequestMatchers;
 
 /**
  * Tests for {@link XpathRequestMatchers}.
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/response/ResponseCreatorsTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/client/response/ResponseCreatorsTests.java
similarity index 95%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/response/ResponseCreatorsTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/client/response/ResponseCreatorsTests.java
index 5cc31942e6..141f1163d2 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/response/ResponseCreatorsTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/client/response/ResponseCreatorsTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.response;
+package org.springframework.test.web.client.response;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
@@ -26,8 +26,8 @@ import org.junit.Test;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.mock.http.client.MockClientHttpResponse;
-import org.springframework.test.web.mock.client.response.DefaultResponseCreator;
-import org.springframework.test.web.mock.client.response.MockRestResponseCreators;
+import org.springframework.test.web.client.response.DefaultResponseCreator;
+import org.springframework.test.web.client.response.MockRestResponseCreators;
 import org.springframework.util.FileCopyUtils;
 
 /**
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/samples/SampleTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/SampleTests.java
similarity index 88%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/samples/SampleTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/SampleTests.java
index 7d0c1b2ffa..c6f5a0ca7c 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/samples/SampleTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/SampleTests.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.samples;
+package org.springframework.test.web.client.samples;
 
 import static org.junit.Assert.assertTrue;
-import static org.springframework.test.web.mock.client.match.MockRestRequestMatchers.method;
-import static org.springframework.test.web.mock.client.match.MockRestRequestMatchers.requestTo;
-import static org.springframework.test.web.mock.client.response.MockRestResponseCreators.withSuccess;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.method;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
+import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -26,8 +26,8 @@ import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
-import org.springframework.test.web.mock.Person;
-import org.springframework.test.web.mock.client.MockRestServiceServer;
+import org.springframework.test.web.Person;
+import org.springframework.test.web.client.MockRestServiceServer;
 import org.springframework.web.client.RestTemplate;
 
 /**
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/samples/matchers/ContentRequestMatcherTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/ContentRequestMatcherTests.java
similarity index 89%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/samples/matchers/ContentRequestMatcherTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/ContentRequestMatcherTests.java
index 70c14e5fdf..4e2a8e861c 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/samples/matchers/ContentRequestMatcherTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/ContentRequestMatcherTests.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.samples.matchers;
+package org.springframework.test.web.client.samples.matchers;
 
 import static org.hamcrest.Matchers.startsWith;
 import static org.junit.Assert.assertTrue;
-import static org.springframework.test.web.mock.client.match.MockRestRequestMatchers.content;
-import static org.springframework.test.web.mock.client.response.MockRestResponseCreators.withSuccess;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.content;
+import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -29,8 +29,8 @@ import org.junit.Test;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter;
-import org.springframework.test.web.mock.Person;
-import org.springframework.test.web.mock.client.MockRestServiceServer;
+import org.springframework.test.web.Person;
+import org.springframework.test.web.client.MockRestServiceServer;
 import org.springframework.web.client.RestTemplate;
 
 /**
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/samples/matchers/HeaderRequestMatcherTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/HeaderRequestMatcherTests.java
similarity index 84%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/samples/matchers/HeaderRequestMatcherTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/HeaderRequestMatcherTests.java
index df059841bd..bf8d9a06ef 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/samples/matchers/HeaderRequestMatcherTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/HeaderRequestMatcherTests.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.samples.matchers;
+package org.springframework.test.web.client.samples.matchers;
 
 import static org.hamcrest.Matchers.containsString;
-import static org.springframework.test.web.mock.client.match.MockRestRequestMatchers.header;
-import static org.springframework.test.web.mock.client.match.MockRestRequestMatchers.requestTo;
-import static org.springframework.test.web.mock.client.response.MockRestResponseCreators.withSuccess;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.header;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
+import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -30,8 +30,8 @@ import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter;
-import org.springframework.test.web.mock.Person;
-import org.springframework.test.web.mock.client.MockRestServiceServer;
+import org.springframework.test.web.Person;
+import org.springframework.test.web.client.MockRestServiceServer;
 import org.springframework.web.client.RestTemplate;
 
 /**
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/samples/matchers/JsonPathRequestMatcherTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/JsonPathRequestMatcherTests.java
similarity index 90%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/samples/matchers/JsonPathRequestMatcherTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/JsonPathRequestMatcherTests.java
index 3ab8ad1788..0c97ca2ca4 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/samples/matchers/JsonPathRequestMatcherTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/JsonPathRequestMatcherTests.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.samples.matchers;
+package org.springframework.test.web.client.samples.matchers;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.endsWith;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.isIn;
 import static org.hamcrest.Matchers.startsWith;
-import static org.springframework.test.web.mock.client.match.MockRestRequestMatchers.content;
-import static org.springframework.test.web.mock.client.match.MockRestRequestMatchers.jsonPath;
-import static org.springframework.test.web.mock.client.match.MockRestRequestMatchers.requestTo;
-import static org.springframework.test.web.mock.client.response.MockRestResponseCreators.withSuccess;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.content;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.jsonPath;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
+import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -34,8 +34,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter;
-import org.springframework.test.web.mock.Person;
-import org.springframework.test.web.mock.client.MockRestServiceServer;
+import org.springframework.test.web.Person;
+import org.springframework.test.web.client.MockRestServiceServer;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/samples/matchers/XmlContentRequestMatcherTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/XmlContentRequestMatcherTests.java
similarity index 89%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/samples/matchers/XmlContentRequestMatcherTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/XmlContentRequestMatcherTests.java
index 40354cf2d3..059e3be310 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/samples/matchers/XmlContentRequestMatcherTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/XmlContentRequestMatcherTests.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.samples.matchers;
+package org.springframework.test.web.client.samples.matchers;
 
 import static org.hamcrest.Matchers.hasXPath;
-import static org.springframework.test.web.mock.client.match.MockRestRequestMatchers.content;
-import static org.springframework.test.web.mock.client.match.MockRestRequestMatchers.requestTo;
-import static org.springframework.test.web.mock.client.response.MockRestResponseCreators.withSuccess;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.content;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
+import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -35,8 +35,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.xml.Jaxb2RootElementHttpMessageConverter;
-import org.springframework.test.web.mock.Person;
-import org.springframework.test.web.mock.client.MockRestServiceServer;
+import org.springframework.test.web.Person;
+import org.springframework.test.web.client.MockRestServiceServer;
 import org.springframework.web.client.RestTemplate;
 
 
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/samples/matchers/XpathRequestMatcherTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatcherTests.java
similarity index 93%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/samples/matchers/XpathRequestMatcherTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatcherTests.java
index 3f8ab81ea2..3e9243114f 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/samples/matchers/XpathRequestMatcherTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatcherTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.samples.matchers;
+package org.springframework.test.web.client.samples.matchers;
 
 import static org.hamcrest.Matchers.closeTo;
 import static org.hamcrest.Matchers.equalTo;
@@ -21,10 +21,10 @@ import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.lessThan;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.startsWith;
-import static org.springframework.test.web.mock.client.match.MockRestRequestMatchers.content;
-import static org.springframework.test.web.mock.client.match.MockRestRequestMatchers.requestTo;
-import static org.springframework.test.web.mock.client.match.MockRestRequestMatchers.xpath;
-import static org.springframework.test.web.mock.client.response.MockRestResponseCreators.withSuccess;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.content;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.xpath;
+import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -43,8 +43,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.xml.Jaxb2RootElementHttpMessageConverter;
-import org.springframework.test.web.mock.Person;
-import org.springframework.test.web.mock.client.MockRestServiceServer;
+import org.springframework.test.web.Person;
+import org.springframework.test.web.client.MockRestServiceServer;
 import org.springframework.web.client.RestTemplate;
 
 /**
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/StubMvcResult.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/StubMvcResult.java
similarity index 96%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/StubMvcResult.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/StubMvcResult.java
index c7fc6f1da4..7ffaabae2e 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/StubMvcResult.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/StubMvcResult.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet;
+package org.springframework.test.web.servlet;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.test.web.mock.servlet.MvcResult;
+import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.web.servlet.FlashMap;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/request/MockHttpServletRequestBuilderTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java
similarity index 99%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/request/MockHttpServletRequestBuilderTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java
index ca9b7d8a0d..da60dfc5b1 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/request/MockHttpServletRequestBuilderTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.servlet.request;
+package org.springframework.test.web.servlet.request;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
@@ -39,6 +39,7 @@ import org.springframework.http.MediaType;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpSession;
 import org.springframework.mock.web.MockServletContext;
+import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.web.servlet.FlashMap;
 import org.springframework.web.servlet.support.SessionFlashMapManager;
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/result/ContentResultMatchersTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/ContentResultMatchersTests.java
similarity index 93%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/result/ContentResultMatchersTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/ContentResultMatchersTests.java
index 26cbc33f93..7cec4989f8 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/result/ContentResultMatchersTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/ContentResultMatchersTests.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
 import org.hamcrest.Matchers;
 import org.junit.Test;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.test.web.mock.servlet.StubMvcResult;
-import org.springframework.test.web.mock.servlet.result.ContentResultMatchers;
+import org.springframework.test.web.servlet.StubMvcResult;
+import org.springframework.test.web.servlet.result.ContentResultMatchers;
 
 /**
  * @author Rossen Stoyanchev
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/result/FlashAttributeResultMatchersTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchersTests.java
similarity index 89%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/result/FlashAttributeResultMatchersTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchersTests.java
index b9ba287f91..0b6e0be447 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/result/FlashAttributeResultMatchersTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchersTests.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
 import org.junit.Test;
-import org.springframework.test.web.mock.servlet.StubMvcResult;
-import org.springframework.test.web.mock.servlet.result.FlashAttributeResultMatchers;
+import org.springframework.test.web.servlet.StubMvcResult;
+import org.springframework.test.web.servlet.result.FlashAttributeResultMatchers;
 import org.springframework.web.servlet.FlashMap;
 
 /**
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/result/JsonPathResultMatchersTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/JsonPathResultMatchersTests.java
similarity index 93%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/result/JsonPathResultMatchersTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/JsonPathResultMatchersTests.java
index 2e7ee9f09e..aae3b456c6 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/result/JsonPathResultMatchersTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/JsonPathResultMatchersTests.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
 import org.hamcrest.Matchers;
 import org.junit.Test;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.test.web.mock.servlet.StubMvcResult;
-import org.springframework.test.web.mock.servlet.result.JsonPathResultMatchers;
+import org.springframework.test.web.servlet.StubMvcResult;
+import org.springframework.test.web.servlet.result.JsonPathResultMatchers;
 
 /**
  * Tests for {@link JsonPathResultMatchers}.
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/result/ModelResultMatchersTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/ModelResultMatchersTests.java
similarity index 94%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/result/ModelResultMatchersTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/ModelResultMatchersTests.java
index 76fa203795..ac9ddd2eb2 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/result/ModelResultMatchersTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/ModelResultMatchersTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
 import static org.hamcrest.Matchers.is;
 
@@ -22,9 +22,9 @@ import java.util.Date;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.StubMvcResult;
-import org.springframework.test.web.mock.servlet.result.ModelResultMatchers;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.StubMvcResult;
+import org.springframework.test.web.servlet.result.ModelResultMatchers;
 import org.springframework.validation.BeanPropertyBindingResult;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.servlet.ModelAndView;
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/result/PrintingResultHandlerTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java
similarity index 97%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/result/PrintingResultHandlerTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java
index 6e84d3f5a7..393d7491b7 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/result/PrintingResultHandlerTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -31,8 +31,8 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.test.web.mock.servlet.StubMvcResult;
-import org.springframework.test.web.mock.servlet.result.PrintingResultHandler;
+import org.springframework.test.web.servlet.StubMvcResult;
+import org.springframework.test.web.servlet.result.PrintingResultHandler;
 import org.springframework.util.Assert;
 import org.springframework.validation.BindException;
 import org.springframework.validation.BindingResult;
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/result/StatusResultMatchersTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/StatusResultMatchersTests.java
similarity index 88%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/result/StatusResultMatchersTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/StatusResultMatchersTests.java
index 186e23fd07..9c1ef6d688 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/result/StatusResultMatchersTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/StatusResultMatchersTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
 import static org.junit.Assert.fail;
 
@@ -27,10 +27,10 @@ import org.springframework.core.Conventions;
 import org.springframework.http.HttpStatus;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.ResultMatcher;
-import org.springframework.test.web.mock.servlet.StubMvcResult;
-import org.springframework.test.web.mock.servlet.result.StatusResultMatchers;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultMatcher;
+import org.springframework.test.web.servlet.StubMvcResult;
+import org.springframework.test.web.servlet.result.StatusResultMatchers;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
 
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/result/XpathResultMatchersTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/XpathResultMatchersTests.java
similarity index 94%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/result/XpathResultMatchersTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/XpathResultMatchersTests.java
index 244dea67cc..1f7e14a322 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/result/XpathResultMatchersTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/XpathResultMatchersTests.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
 import org.hamcrest.Matchers;
 import org.junit.Test;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.test.web.mock.servlet.StubMvcResult;
-import org.springframework.test.web.mock.servlet.result.XpathResultMatchers;
+import org.springframework.test.web.servlet.StubMvcResult;
+import org.springframework.test.web.servlet.result.XpathResultMatchers;
 
 /**
  * Tests for {@link XpathResultMatchers}.
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/context/JavaConfigTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java
similarity index 85%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/context/JavaConfigTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java
index 363d199910..aa7762aab3 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/context/JavaConfigTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.context;
+package org.springframework.test.web.servlet.samples.context;
 
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.forwardedUrl;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.forwardedUrl;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -29,9 +29,9 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.test.web.mock.servlet.MockMvc;
-import org.springframework.test.web.mock.servlet.samples.context.JavaConfigTests.WebConfig;
-import org.springframework.test.web.mock.servlet.setup.MockMvcBuilders;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.samples.context.JavaConfigTests.WebConfig;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/context/SecurityRequestPostProcessors.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/SecurityRequestPostProcessors.java
similarity index 98%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/context/SecurityRequestPostProcessors.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/SecurityRequestPostProcessors.java
index 8b19709567..571cd2c6f0 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/context/SecurityRequestPostProcessors.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/SecurityRequestPostProcessors.java
@@ -10,7 +10,7 @@
  * 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.test.web.mock.servlet.samples.context;
+package org.springframework.test.web.servlet.samples.context;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -34,7 +34,7 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.web.context.HttpRequestResponseHolder;
 import org.springframework.security.web.context.HttpSessionSecurityContextRepository;
 import org.springframework.security.web.context.SecurityContextRepository;
-import org.springframework.test.web.mock.servlet.request.RequestPostProcessor;
+import org.springframework.test.web.servlet.request.RequestPostProcessor;
 import org.springframework.util.Assert;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/context/SpringSecurityTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/SpringSecurityTests.java
similarity index 79%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/context/SpringSecurityTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/SpringSecurityTests.java
index ead229289c..6622d4972d 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/context/SpringSecurityTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/SpringSecurityTests.java
@@ -11,15 +11,15 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.context;
+package org.springframework.test.web.servlet.samples.context;
 
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.forwardedUrl;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.redirectedUrl;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.samples.context.SecurityRequestPostProcessors.user;
-import static org.springframework.test.web.mock.servlet.samples.context.SecurityRequestPostProcessors.userDeatilsService;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.forwardedUrl;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.redirectedUrl;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.samples.context.SecurityRequestPostProcessors.user;
+import static org.springframework.test.web.servlet.samples.context.SecurityRequestPostProcessors.userDeatilsService;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
@@ -36,11 +36,11 @@ import org.springframework.security.web.context.HttpSessionSecurityContextReposi
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.test.web.mock.servlet.MockMvc;
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.ResultMatcher;
-import org.springframework.test.web.mock.servlet.request.RequestPostProcessor;
-import org.springframework.test.web.mock.servlet.setup.MockMvcBuilders;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultMatcher;
+import org.springframework.test.web.servlet.request.RequestPostProcessor;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
 /**
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/context/WebAppResourceTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/WebAppResourceTests.java
similarity index 78%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/context/WebAppResourceTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/WebAppResourceTests.java
index bea061db13..2fb361f915 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/context/WebAppResourceTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/WebAppResourceTests.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.context;
+package org.springframework.test.web.servlet.samples.context;
 
 import static org.hamcrest.Matchers.containsString;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.forwardedUrl;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.handler;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.forwardedUrl;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.handler;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -30,8 +30,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.test.web.mock.servlet.MockMvc;
-import org.springframework.test.web.mock.servlet.setup.MockMvcBuilders;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.resource.DefaultServletHttpRequestHandler;
 
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/context/XmlConfigTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/XmlConfigTests.java
similarity index 81%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/context/XmlConfigTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/XmlConfigTests.java
index 24563c0d51..73ab1ab0a9 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/context/XmlConfigTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/XmlConfigTests.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.context;
+package org.springframework.test.web.servlet.samples.context;
 
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.*;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.*;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -26,8 +26,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.test.web.mock.servlet.MockMvc;
-import org.springframework.test.web.mock.servlet.setup.MockMvcBuilders;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
 /**
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/AsyncTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java
similarity index 79%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/AsyncTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java
index 539c9474a6..342f02e3fe 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/AsyncTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.servlet.samples.standalone;
+package org.springframework.test.web.servlet.samples.standalone;
 
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.request;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.request;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import java.util.concurrent.Callable;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.Person;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.Person;
+import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.async.DeferredResult;
 
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/ExceptionHandlerTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/ExceptionHandlerTests.java
similarity index 79%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/ExceptionHandlerTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/ExceptionHandlerTests.java
index e04a0481e4..9668622584 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/ExceptionHandlerTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/ExceptionHandlerTests.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.standalone;
+package org.springframework.test.web.servlet.samples.standalone;
 
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.forwardedUrl;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.forwardedUrl;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import org.junit.Test;
 import org.springframework.stereotype.Controller;
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/FileUploadControllerTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/FileUploadControllerTests.java
similarity index 83%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/FileUploadControllerTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/FileUploadControllerTests.java
index 268dc53c1c..4053d79480 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/FileUploadControllerTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/FileUploadControllerTests.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.servlet.samples.standalone;
+package org.springframework.test.web.servlet.samples.standalone;
 
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.fileUpload;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.model;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.fileUpload;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import java.io.IOException;
 
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/FilterTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/FilterTests.java
similarity index 88%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/FilterTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/FilterTests.java
index d835f1b830..56539b9921 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/FilterTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/FilterTests.java
@@ -10,14 +10,14 @@
  * 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.test.web.mock.servlet.samples.standalone;
+package org.springframework.test.web.servlet.samples.standalone;
 
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.flash;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.model;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.redirectedUrl;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.flash;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.redirectedUrl;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import java.io.IOException;
 import java.security.Principal;
@@ -33,7 +33,7 @@ import javax.validation.Valid;
 
 import org.junit.Test;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.Person;
+import org.springframework.test.web.Person;
 import org.springframework.validation.Errors;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/RedirectTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RedirectTests.java
similarity index 87%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/RedirectTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RedirectTests.java
index 0ec649ce9c..f3ee74e8ce 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/RedirectTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RedirectTests.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.standalone;
+package org.springframework.test.web.servlet.samples.standalone;
 
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.*;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.*;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import javax.validation.Valid;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.Person;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.Person;
+import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.ui.Model;
 import org.springframework.validation.Errors;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/RequestBuilderTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestBuilderTests.java
similarity index 82%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/RequestBuilderTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestBuilderTests.java
index f659480c2d..b62a0e3ded 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/RequestBuilderTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestBuilderTests.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.servlet.samples.standalone;
+package org.springframework.test.web.servlet.samples.standalone;
 
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -26,8 +26,8 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.servlet.MockMvc;
-import org.springframework.test.web.mock.servlet.request.RequestPostProcessor;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.RequestPostProcessor;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/RequestParameterTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestParameterTests.java
similarity index 73%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/RequestParameterTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestParameterTests.java
index 8d897c886e..0663748b99 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/RequestParameterTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestParameterTests.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.servlet.samples.standalone;
+package org.springframework.test.web.servlet.samples.standalone;
 
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import org.junit.Test;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.Person;
+import org.springframework.test.web.Person;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/ResponseBodyTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/ResponseBodyTests.java
similarity index 80%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/ResponseBodyTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/ResponseBodyTests.java
index 3c79e4a5fe..f6e3a91639 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/ResponseBodyTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/ResponseBodyTests.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.standalone;
+package org.springframework.test.web.servlet.samples.standalone;
 
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.*;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import org.junit.Test;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.Person;
+import org.springframework.test.web.Person;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/ViewResolutionTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/ViewResolutionTests.java
similarity index 85%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/ViewResolutionTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/ViewResolutionTests.java
index 0c42cb5fba..4545ff3e05 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/ViewResolutionTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/ViewResolutionTests.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.standalone;
+package org.springframework.test.web.servlet.samples.standalone;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasProperty;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.forwardedUrl;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.model;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.xpath;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.forwardedUrl;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.xpath;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -34,8 +34,8 @@ import org.junit.Test;
 import org.springframework.http.MediaType;
 import org.springframework.oxm.jaxb.Jaxb2Marshaller;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.Person;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.Person;
+import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.ui.Model;
 import org.springframework.web.accept.ContentNegotiationManager;
 import org.springframework.web.accept.FixedContentNegotiationStrategy;
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resulthandlers/PrintingResultHandlerTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerTests.java
similarity index 94%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resulthandlers/PrintingResultHandlerTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerTests.java
index c0d3adedc2..8da1db2e4c 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resulthandlers/PrintingResultHandlerTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.standalone.resulthandlers;
+package org.springframework.test.web.servlet.samples.standalone.resulthandlers;
 
 import org.junit.Test;
 import org.springframework.stereotype.Controller;
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/ContentAssertionTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ContentAssertionTests.java
similarity index 89%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/ContentAssertionTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ContentAssertionTests.java
index e5cda13db3..454728c552 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/ContentAssertionTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ContentAssertionTests.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.standalone.resultmatchers;
+package org.springframework.test.web.servlet.samples.standalone.resultmatchers;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.*;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.*;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/CookieAssertionTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/CookieAssertionTests.java
similarity index 85%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/CookieAssertionTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/CookieAssertionTests.java
index 0a6dcf1b4d..110d9a7f50 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/CookieAssertionTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/CookieAssertionTests.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.standalone.resultmatchers;
+package org.springframework.test.web.servlet.samples.standalone.resultmatchers;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.startsWith;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.cookie;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.cookie;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.i18n.CookieLocaleResolver;
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java
similarity index 84%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java
index dce7a4d308..ae60ff4ca7 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java
@@ -14,23 +14,23 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.standalone.resultmatchers;
+package org.springframework.test.web.servlet.samples.standalone.resultmatchers;
 
 import static org.hamcrest.Matchers.closeTo;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.notNullValue;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.flash;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.flash;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import java.net.URL;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/HandlerAssertionTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/HandlerAssertionTests.java
similarity index 81%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/HandlerAssertionTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/HandlerAssertionTests.java
index 536d59e40d..e2a6d5a199 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/HandlerAssertionTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/HandlerAssertionTests.java
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.standalone.resultmatchers;
+package org.springframework.test.web.servlet.samples.standalone.resultmatchers;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.handler;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.handler;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import java.lang.reflect.Method;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/HeaderAssertionTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/HeaderAssertionTests.java
similarity index 83%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/HeaderAssertionTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/HeaderAssertionTests.java
index 2da15c5c35..d8bfe0c780 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/HeaderAssertionTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/HeaderAssertionTests.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.standalone.resultmatchers;
+package org.springframework.test.web.servlet.samples.standalone.resultmatchers;
 
 import static org.hamcrest.Matchers.nullValue;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.header;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import java.util.Date;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.Person;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.Person;
+import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/JsonPathAssertionTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/JsonPathAssertionTests.java
similarity index 88%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/JsonPathAssertionTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/JsonPathAssertionTests.java
index aaaac9e840..f5c626254f 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/JsonPathAssertionTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/JsonPathAssertionTests.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.standalone.resultmatchers;
+package org.springframework.test.web.servlet.samples.standalone.resultmatchers;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.endsWith;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.isIn;
 import static org.hamcrest.Matchers.startsWith;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import java.util.Arrays;
 
@@ -33,8 +33,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.Person;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.Person;
+import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/ModelAssertionTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ModelAssertionTests.java
similarity index 88%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/ModelAssertionTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ModelAssertionTests.java
index 01afee6e38..a7f76e1813 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/ModelAssertionTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ModelAssertionTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.standalone.resultmatchers;
+package org.springframework.test.web.servlet.samples.standalone.resultmatchers;
 
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.endsWith;
@@ -25,17 +25,17 @@ import static org.hamcrest.Matchers.lessThan;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
 import static org.hamcrest.Matchers.startsWith;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.*;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.*;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import javax.validation.Valid;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.Person;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.Person;
+import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/RequestAttributeAssertionTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/RequestAttributeAssertionTests.java
similarity index 85%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/RequestAttributeAssertionTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/RequestAttributeAssertionTests.java
index a94ea52bf5..4779f52608 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/RequestAttributeAssertionTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/RequestAttributeAssertionTests.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.standalone.resultmatchers;
+package org.springframework.test.web.servlet.samples.standalone.resultmatchers;
 
 import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.not;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.request;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.request;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.HandlerMapping;
 
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/SessionAttributeAssertionTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/SessionAttributeAssertionTests.java
similarity index 80%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/SessionAttributeAssertionTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/SessionAttributeAssertionTests.java
index 2a55f99e63..654feef07c 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/SessionAttributeAssertionTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/SessionAttributeAssertionTests.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.standalone.resultmatchers;
+package org.springframework.test.web.servlet.samples.standalone.resultmatchers;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.notNullValue;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.request;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.request;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import java.util.Locale;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/StatusAssertionTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/StatusAssertionTests.java
similarity index 87%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/StatusAssertionTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/StatusAssertionTests.java
index 4a22c29563..2233018309 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/StatusAssertionTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/StatusAssertionTests.java
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.standalone.resultmatchers;
+package org.springframework.test.web.servlet.samples.standalone.resultmatchers;
 
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.endsWith;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 import static org.hamcrest.Matchers.lessThan;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/UrlAssertionTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/UrlAssertionTests.java
similarity index 74%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/UrlAssertionTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/UrlAssertionTests.java
index 75c003875a..278c2cf949 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/UrlAssertionTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/UrlAssertionTests.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.standalone.resultmatchers;
+package org.springframework.test.web.servlet.samples.standalone.resultmatchers;
 
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.forwardedUrl;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.redirectedUrl;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.forwardedUrl;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.redirectedUrl;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/ViewNameAssertionTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ViewNameAssertionTests.java
similarity index 76%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/ViewNameAssertionTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ViewNameAssertionTests.java
index deee90d77e..8d57d18321 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/ViewNameAssertionTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ViewNameAssertionTests.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.standalone.resultmatchers;
+package org.springframework.test.web.servlet.samples.standalone.resultmatchers;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.view;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/XmlContentAssertionTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XmlContentAssertionTests.java
similarity index 86%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/XmlContentAssertionTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XmlContentAssertionTests.java
index 56fbdf76e3..e165975b97 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/XmlContentAssertionTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XmlContentAssertionTests.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.standalone.resultmatchers;
+package org.springframework.test.web.servlet.samples.standalone.resultmatchers;
 
 import static org.hamcrest.Matchers.hasXPath;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import java.util.Arrays;
 import java.util.List;
@@ -35,8 +35,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.Person;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.Person;
+import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java
similarity index 90%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java
index 62157b0852..137e3e2d50 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.standalone.resultmatchers;
+package org.springframework.test.web.servlet.samples.standalone.resultmatchers;
 
 import static org.hamcrest.Matchers.*;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.xpath;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.xpath;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -38,8 +38,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.Person;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.Person;
+import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/setup/ConditionalDelegatingFilterProxyTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/setup/ConditionalDelegatingFilterProxyTests.java
similarity index 98%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/setup/ConditionalDelegatingFilterProxyTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/setup/ConditionalDelegatingFilterProxyTests.java
index f1b482b918..75484889e4 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/setup/ConditionalDelegatingFilterProxyTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/setup/ConditionalDelegatingFilterProxyTests.java
@@ -10,7 +10,7 @@
  * 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.test.web.mock.servlet.setup;
+package org.springframework.test.web.servlet.setup;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
@@ -31,7 +31,7 @@ import org.springframework.mock.web.MockFilterChain;
 import org.springframework.mock.web.MockFilterConfig;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.test.web.mock.servlet.setup.PatternMappingFilterProxy;
+import org.springframework.test.web.servlet.setup.PatternMappingFilterProxy;
 
 /**
  *
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/setup/DefaultMockMvcBuilderTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilderTests.java
similarity index 91%
rename from spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/setup/DefaultMockMvcBuilderTests.java
rename to spring-test-mvc/src/test/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilderTests.java
index c91d7f21cd..f7b07594ba 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/setup/DefaultMockMvcBuilderTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilderTests.java
@@ -10,7 +10,7 @@
  * 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.test.web.mock.servlet.setup;
+package org.springframework.test.web.servlet.setup;
 
 import java.io.IOException;
 
@@ -23,8 +23,8 @@ import javax.servlet.http.HttpServletResponse;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.servlet.setup.DefaultMockMvcBuilder;
-import org.springframework.test.web.mock.servlet.setup.MockMvcBuilders;
+import org.springframework.test.web.servlet.setup.DefaultMockMvcBuilder;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.filter.OncePerRequestFilter;
 
diff --git a/spring-test-mvc/src/test/resources/org/springframework/test/web/mock/client/samples/ludwig.json b/spring-test-mvc/src/test/resources/org/springframework/test/web/client/samples/ludwig.json
similarity index 100%
rename from spring-test-mvc/src/test/resources/org/springframework/test/web/mock/client/samples/ludwig.json
rename to spring-test-mvc/src/test/resources/org/springframework/test/web/client/samples/ludwig.json
diff --git a/spring-test-mvc/src/test/resources/org/springframework/test/web/mock/servlet/samples/context/security.xml b/spring-test-mvc/src/test/resources/org/springframework/test/web/servlet/samples/context/security.xml
similarity index 100%
rename from spring-test-mvc/src/test/resources/org/springframework/test/web/mock/servlet/samples/context/security.xml
rename to spring-test-mvc/src/test/resources/org/springframework/test/web/servlet/samples/context/security.xml
diff --git a/spring-test-mvc/src/test/resources/org/springframework/test/web/mock/servlet/samples/context/servlet-context.xml b/spring-test-mvc/src/test/resources/org/springframework/test/web/servlet/samples/context/servlet-context.xml
similarity index 100%
rename from spring-test-mvc/src/test/resources/org/springframework/test/web/mock/servlet/samples/context/servlet-context.xml
rename to spring-test-mvc/src/test/resources/org/springframework/test/web/servlet/samples/context/servlet-context.xml
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/AssertionErrors.java b/spring-test/src/main/java/org/springframework/test/util/AssertionErrors.java
similarity index 98%
rename from spring-test-mvc/src/main/java/org/springframework/test/web/mock/AssertionErrors.java
rename to spring-test/src/main/java/org/springframework/test/util/AssertionErrors.java
index e1370d100c..ab112e698a 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/AssertionErrors.java
+++ b/spring-test/src/main/java/org/springframework/test/util/AssertionErrors.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock;
+package org.springframework.test.util;
 
 /**
  * JUnit independent assertion class.