diff --git a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/ClientWebSocketContainerTests.java b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/ClientWebSocketContainerTests.java
index 449311402e..f6ed2f9b00 100644
--- a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/ClientWebSocketContainerTests.java
+++ b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/ClientWebSocketContainerTests.java
@@ -35,6 +35,7 @@ import java.util.concurrent.TimeUnit;
 import org.apache.tomcat.websocket.WsWebSocketContainer;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import org.springframework.web.socket.CloseStatus;
@@ -63,6 +64,7 @@ public class ClientWebSocketContainerTests {
 	}
 
 	@Test
+	@Ignore("Ignored until fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=58624")
 	public void testClientWebSocketContainer() throws Exception {
 		StandardWebSocketClient webSocketClient = new StandardWebSocketClient();
 		Map<String, Object> userProperties = new HashMap<String, Object>();