diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcChannelMessageStore.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcChannelMessageStore.java
index 458b11663b..d7115c11c1 100644
--- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcChannelMessageStore.java
+++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcChannelMessageStore.java
@@ -46,11 +46,8 @@ import org.springframework.core.serializer.support.SerializingConverter;
 import org.springframework.integration.IntegrationMessageHeaderAccessor;
 import org.springframework.integration.jdbc.JdbcMessageStore;
 import org.springframework.integration.jdbc.store.channel.ChannelMessageStoreQueryProvider;
-import org.springframework.integration.jdbc.store.channel.DerbyChannelMessageStoreQueryProvider;
 import org.springframework.integration.jdbc.store.channel.MessageRowMapper;
-import org.springframework.integration.jdbc.store.channel.MySqlChannelMessageStoreQueryProvider;
 import org.springframework.integration.jdbc.store.channel.OracleChannelMessageStoreQueryProvider;
-import org.springframework.integration.jdbc.store.channel.PostgresChannelMessageStoreQueryProvider;
 import org.springframework.integration.store.MessageGroup;
 import org.springframework.integration.store.MessageGroupFactory;
 import org.springframework.integration.store.MessageGroupStore;
@@ -252,27 +249,17 @@ public class JdbcChannelMessageStore implements PriorityCapableChannelMessageSto
 	}
 
 	/**
-	 * <p>
-	 * Sets the database specific {@link ChannelMessageStoreQueryProvider} to use. The {@link JdbcChannelMessageStore}
-	 * provides the SQL queries to retrieve messages from the database. The
-	 * following {@link ChannelMessageStoreQueryProvider} are provided:
-	 * </p>
-	 * <ul>
-	 *     <li>{@link DerbyChannelMessageStoreQueryProvider}</li>
-	 *     <li>{@link MySqlChannelMessageStoreQueryProvider}</li>
-	 *     <li>{@link OracleChannelMessageStoreQueryProvider}</li>
-	 *     <li>{@link PostgresChannelMessageStoreQueryProvider}</li>
-	 * </ul>
-	 * <p>
-	 * Beyond, you can provide your own query implementations, in case you need
-	 * to support additional databases and/or need to fine-tune the queries for
-	 * your requirements.
-	 * </p>
-	 *
+	 * Sets the database specific {@link ChannelMessageStoreQueryProvider} to use.
+	 * The {@link JdbcChannelMessageStore} provides the SQL queries to retrieve messages from
+	 * the database. See the JavaDocs {@link ChannelMessageStoreQueryProvider} (all known
+	 * implementing classes) to see those implementations provided by the framework.
+	 * <p> You can provide your own query implementations, if you need to support additional
+	 * databases and/or need to fine-tune the queries for your requirements.
 	 * @param channelMessageStoreQueryProvider Must not be null.
 	 */
 	public void setChannelMessageStoreQueryProvider(ChannelMessageStoreQueryProvider channelMessageStoreQueryProvider) {
-		Assert.notNull(channelMessageStoreQueryProvider, "The provided channelMessageStoreQueryProvider must not be null.");
+		Assert.notNull(channelMessageStoreQueryProvider,
+				"The provided channelMessageStoreQueryProvider must not be null.");
 		this.channelMessageStoreQueryProvider = channelMessageStoreQueryProvider;
 	}
 
diff --git a/spring-integration-test/src/main/java/org/springframework/integration/test/support/LogAdjustingTestSupport.java b/spring-integration-test/src/main/java/org/springframework/integration/test/support/LogAdjustingTestSupport.java
index ff7f9e1790..151d754a8e 100644
--- a/spring-integration-test/src/main/java/org/springframework/integration/test/support/LogAdjustingTestSupport.java
+++ b/spring-integration-test/src/main/java/org/springframework/integration/test/support/LogAdjustingTestSupport.java
@@ -34,8 +34,10 @@ import org.junit.rules.TestName;
  * Base class for module tests where logging is set to TRACE for the duration
  * of the test and reverted to the previous value. Also logs a start/end
  * message. Duplicated in s-i-core/src/test for use there, to avoid circular dep.
+ *
  * @author Artem Bilan
  * @author Gary Russell
+ *
  * @since 4.2.2
  *
  */
@@ -71,12 +73,12 @@ public class LogAdjustingTestSupport {
 			this.oldCategories.add(loggerToAdjust.getEffectiveLevel());
 			loggerToAdjust.setLevel(Level.TRACE);
 		}
-		this.logger.debug("!!!! Starting test: " + this.testName.getMethodName() + " !!!!");
+		this.logger.warn("!!!! Starting test: " + this.testName.getMethodName() + " !!!!");
 	}
 
 	@After
 	public void afterTest() {
-		logger.debug("!!!! Finished test: " + this.testName.getMethodName() + " !!!!");
+		logger.warn("!!!! Finished test: " + this.testName.getMethodName() + " !!!!");
 		Iterator<Level> oldCategory = this.oldCategories.iterator();
 		for (Logger loggerToAdjust : this.loggersToAdjust) {
 			loggerToAdjust.setLevel(oldCategory.next());
diff --git a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/client/StompIntegrationTests.java b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/client/StompIntegrationTests.java
index d01f09c2d5..9be482ff9c 100644
--- a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/client/StompIntegrationTests.java
+++ b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/client/StompIntegrationTests.java
@@ -56,6 +56,7 @@ import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.config.EnableIntegration;
 import org.springframework.integration.core.MessageProducer;
 import org.springframework.integration.event.inbound.ApplicationEventListeningMessageProducer;
+import org.springframework.integration.test.support.LogAdjustingTestSupport;
 import org.springframework.integration.test.util.TestUtils;
 import org.springframework.integration.transformer.ExpressionEvaluatingTransformer;
 import org.springframework.integration.websocket.ClientWebSocketContainer;
@@ -108,7 +109,7 @@ import org.springframework.web.socket.sockjs.client.WebSocketTransport;
 @ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
 @DirtiesContext
-public class StompIntegrationTests {
+public class StompIntegrationTests extends LogAdjustingTestSupport {
 
 	@Value("#{server.serverContext}")
 	private ApplicationContext serverContext;
@@ -128,6 +129,10 @@ public class StompIntegrationTests {
 	@Qualifier("webSocketEvents")
 	private QueueChannel webSocketEvents;
 
+	public StompIntegrationTests() {
+		super("org.springframework", "org.springframework.integration");
+	}
+
 	@Before
 	public void setup() {
 		this.webSocketInputChannel.clear();