diff --git a/spring-websocket/src/main/resources/META-INF/spring.tooling b/spring-websocket/src/main/resources/META-INF/spring.tooling
index df867548ed..ab43a02082 100644
--- a/spring-websocket/src/main/resources/META-INF/spring.tooling
+++ b/spring-websocket/src/main/resources/META-INF/spring.tooling
@@ -1,4 +1,4 @@
 # Tooling related information for the mvc namespace
 http\://www.springframework.org/schema/websocket@name=websocket Namespace
 http\://www.springframework.org/schema/websocket@prefix=websocket
-http\://www.springframework.org/schema/websocket@icon=org/springframework/web/socket/server/config/xml/spring-websocket.gif
+http\://www.springframework.org/schema/websocket@icon=org/springframework/web/socket/config/spring-websocket.gif
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/config/AbstractWebSocketHandlerRegistrationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/AbstractWebSocketHandlerRegistrationTests.java
similarity index 99%
rename from spring-websocket/src/test/java/org/springframework/web/socket/config/AbstractWebSocketHandlerRegistrationTests.java
rename to spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/AbstractWebSocketHandlerRegistrationTests.java
index 4a95ab5f0d..1115bb837e 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/config/AbstractWebSocketHandlerRegistrationTests.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/AbstractWebSocketHandlerRegistrationTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.socket.config;
+package org.springframework.web.socket.config.annotation;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/config/WebMvcStompEndpointRegistrationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebMvcStompEndpointRegistrationTests.java
similarity index 98%
rename from spring-websocket/src/test/java/org/springframework/web/socket/config/WebMvcStompEndpointRegistrationTests.java
rename to spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebMvcStompEndpointRegistrationTests.java
index e97cdc12b4..923f024eba 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/config/WebMvcStompEndpointRegistrationTests.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebMvcStompEndpointRegistrationTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.socket.config;
+package org.springframework.web.socket.config.annotation;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/config/WebMvcStompEndpointRegistryTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebMvcStompEndpointRegistryTests.java
similarity index 98%
rename from spring-websocket/src/test/java/org/springframework/web/socket/config/WebMvcStompEndpointRegistryTests.java
rename to spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebMvcStompEndpointRegistryTests.java
index 0a8e602fb8..33e16cea88 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/config/WebMvcStompEndpointRegistryTests.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebMvcStompEndpointRegistryTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.socket.config;
+package org.springframework.web.socket.config.annotation;
 
 import java.util.Map;
 
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/config/WebSocketConfigurationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketConfigurationTests.java
similarity index 98%
rename from spring-websocket/src/test/java/org/springframework/web/socket/config/WebSocketConfigurationTests.java
rename to spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketConfigurationTests.java
index de6687bad4..3f3d0c732e 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/config/WebSocketConfigurationTests.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketConfigurationTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.socket.config;
+package org.springframework.web.socket.config.annotation;
 
 import java.util.Arrays;
 import java.util.concurrent.CountDownLatch;
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/config/WebSocketMessageBrokerConfigurationSupportTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupportTests.java
similarity index 99%
rename from spring-websocket/src/test/java/org/springframework/web/socket/config/WebSocketMessageBrokerConfigurationSupportTests.java
rename to spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupportTests.java
index 041df76125..bbd50c0e96 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/config/WebSocketMessageBrokerConfigurationSupportTests.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupportTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.socket.config;
+package org.springframework.web.socket.config.annotation;
 
 import java.util.ArrayList;
 import java.util.List;