diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/JettyWebSocketTestServer.java b/spring-websocket/src/test/java/org/springframework/web/socket/JettyWebSocketTestServer.java
index 5641a8c77bbac63b574bae2677b449d93b7997f5..4f83b576623991d5340618f1797ba728edcbd307 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/JettyWebSocketTestServer.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/JettyWebSocketTestServer.java
@@ -82,7 +82,7 @@ public class JettyWebSocketTestServer implements WebSocketTestServer {
 	@Override
 	public void stop() throws Exception {
 		if (this.jettyServer.isRunning()) {
-			this.jettyServer.setStopTimeout(0);
+			this.jettyServer.setStopTimeout(5000);
 			this.jettyServer.stop();
 		}
 	}
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/AbstractSockJsIntegrationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/AbstractSockJsIntegrationTests.java
index 3846578355daa2dff8915aa5650f9be60f35fd5f..1c19aa844c071cf1cee59dce1157b820e35e1b87 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/AbstractSockJsIntegrationTests.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/AbstractSockJsIntegrationTests.java
@@ -122,6 +122,12 @@ public abstract class AbstractSockJsIntegrationTests {
 		catch (Throwable t) {
 			logger.error("Failed to stop server", t);
 		}
+		try {
+			this.wac.close();
+		}
+		catch (Throwable t) {
+			logger.error("Failed to close WebApplicationContext", t);
+		}
 	}
 
 	protected abstract Class<?> upgradeStrategyConfigClass();