diff --git a/applications/stomp-chat/src/test/java/org/springframework/integration/samples/chat/stomp/server/ApplicationTests.java b/applications/stomp-chat/src/test/java/org/springframework/integration/samples/chat/stomp/server/ApplicationTests.java
index dfe684cd..614d5447 100644
--- a/applications/stomp-chat/src/test/java/org/springframework/integration/samples/chat/stomp/server/ApplicationTests.java
+++ b/applications/stomp-chat/src/test/java/org/springframework/integration/samples/chat/stomp/server/ApplicationTests.java
@@ -31,7 +31,7 @@ import org.springframework.test.context.web.WebAppConfiguration;
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = Application.class)
 @WebAppConfiguration
-@IntegrationTest
+@IntegrationTest({"server.port=0", "management.port=0"})
 public class ApplicationTests {
 
 	@Test
diff --git a/basic/web-sockets/src/main/resources/org/springframework/integration/samples/websocket/standard/client/client-context.xml b/basic/web-sockets/src/main/resources/org/springframework/integration/samples/websocket/standard/client/client-context.xml
index fdfc4f92..dc8741e0 100644
--- a/basic/web-sockets/src/main/resources/org/springframework/integration/samples/websocket/standard/client/client-context.xml
+++ b/basic/web-sockets/src/main/resources/org/springframework/integration/samples/websocket/standard/client/client-context.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	   xmlns:int="http://www.springframework.org/schema/integration"
-	   xmlns:int-websocket="http://www.springframework.org/schema/integration/websocket"
-	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans
-	   http://www.springframework.org/schema/beans/spring-beans.xsd
-	   http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd
-			http://www.springframework.org/schema/integration/websocket
-			http://www.springframework.org/schema/integration/websocket/spring-integration-websocket.xsd">
+	xmlns:int="http://www.springframework.org/schema/integration"
+	xmlns:int-websocket="http://www.springframework.org/schema/integration/websocket"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd
+		http://www.springframework.org/schema/integration/websocket http://www.springframework.org/schema/integration/websocket/spring-integration-websocket.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd">
+
+	<context:property-placeholder />
 
 	<bean id="webSocketClient" class="org.springframework.web.socket.client.standard.StandardWebSocketClient"/>
 
 	<int-websocket:client-container id="clientWebSocketContainer"
 									client="webSocketClient"
-									uri="ws://localhost:8080/time/websocket"/>
+									uri="ws://localhost:${local.server.port:8080}/time/websocket"/>
 
 	<int-websocket:inbound-channel-adapter container="clientWebSocketContainer"
 										   channel="webSocketInputChannel"/>
diff --git a/basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java b/basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java
index 6da9b08e..ea23753a 100644
--- a/basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java
+++ b/basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java
@@ -31,6 +31,7 @@ import java.util.concurrent.TimeUnit;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.IntegrationTest;
 import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -50,11 +51,15 @@ import org.springframework.test.context.web.WebAppConfiguration;
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = Application.class)
 @WebAppConfiguration
-@IntegrationTest
+@IntegrationTest({"server.port=0", "management.port=0"})
 public class ApplicationTests {
 
+	@Value("${local.server.port}")
+	private String port;
+
 	@Test
 	public void testWebSockets() throws InterruptedException {
+		System.setProperty("local.server.port", this.port);
 		ConfigurableApplicationContext ctx = new ClassPathXmlApplicationContext("client-context.xml",
 				org.springframework.integration.samples.websocket.standard.client.Application.class);
 		DirectChannel webSocketInputChannel = ctx.getBean("webSocketInputChannel", DirectChannel.class);