diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitUtils.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitUtils.java
index dafbcc23..0309f657 100644
--- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitUtils.java
+++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitUtils.java
@@ -163,7 +163,7 @@ public abstract class RabbitUtils {
 
 	/**
 	 * Gets and removes a ThreadLocal indicating the channel MUST be physically closed.
-	 * @return
+	 * @return true if the channel must be physically closed
 	 */
 	public static boolean isPhysicalCloseRequired() {
 		Boolean mustClose = physicalCloseRequired.get();
diff --git a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/StopStartIntegrationTests.java b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/StopStartIntegrationTests.java
index 05e27dea..8fdfe5ec 100644
--- a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/StopStartIntegrationTests.java
+++ b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/StopStartIntegrationTests.java
@@ -45,7 +45,7 @@ public class StopStartIntegrationTests {
 
 	private static AtomicInteger deliveries = new AtomicInteger();
 
-	private static int COUNT = 300000;
+	private static int COUNT = 10000;
 
 	@Autowired
 	private ApplicationContext ctx;
@@ -66,7 +66,7 @@ public class StopStartIntegrationTests {
 		int n;
 		int lastN = 0;
 		while ((n = deliveries.get()) < COUNT) {
-			Thread.sleep(5000);
+			Thread.sleep(2000);
 			container.stop();
 			container.start();
 			if (System.currentTimeMillis() - t > 240000 && lastN == n) {
diff --git a/spring-rabbit/src/test/resources/org/springframework/amqp/rabbit/listener/StopStartIntegrationTests-context.xml b/spring-rabbit/src/test/resources/org/springframework/amqp/rabbit/listener/StopStartIntegrationTests-context.xml
index 03c4dbb7..a8e89b9d 100644
--- a/spring-rabbit/src/test/resources/org/springframework/amqp/rabbit/listener/StopStartIntegrationTests-context.xml
+++ b/spring-rabbit/src/test/resources/org/springframework/amqp/rabbit/listener/StopStartIntegrationTests-context.xml
@@ -20,7 +20,7 @@
         </rabbit:bindings>
     </rabbit:direct-exchange>
 
-	<rabbit:listener-container connection-factory="connectionFactory" concurrency="10" prefetch="20" auto-startup="false">
+	<rabbit:listener-container connection-factory="connectionFactory" concurrency="2" prefetch="5" auto-startup="false">
 		<rabbit:listener ref="listener" queue-names="stop.start.queue" />
 	</rabbit:listener-container>