diff --git a/org.springframework.testsuite/src/test/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMappingTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMappingTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMappingTests.java
rename to org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMappingTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/web/servlet/handler/PathMatchingUrlHandlerMappingTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/handler/PathMatchingUrlHandlerMappingTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/web/servlet/handler/PathMatchingUrlHandlerMappingTests.java
rename to org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/handler/PathMatchingUrlHandlerMappingTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolverTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolverTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolverTests.java
rename to org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolverTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMappingTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMappingTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMappingTests.java
rename to org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMappingTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/web/servlet/handler/map1.xml b/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/handler/map1.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/web/servlet/handler/map1.xml
rename to org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/handler/map1.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/web/servlet/handler/map2.properties b/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/handler/map2.properties
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/web/servlet/handler/map2.properties
rename to org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/handler/map2.properties
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/web/servlet/handler/map2.xml b/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/handler/map2.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/web/servlet/handler/map2.xml
rename to org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/handler/map2.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/web/servlet/handler/map2err.xml b/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/handler/map2err.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/web/servlet/handler/map2err.xml
rename to org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/handler/map2err.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/web/servlet/handler/map3.xml b/org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/handler/map3.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/web/servlet/handler/map3.xml
rename to org.springframework.web.servlet/src/test/resources/org/springframework/web/servlet/handler/map3.xml