diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PollingAdapterMBeanTests-context.xml b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PollingAdapterMBeanTests-context.xml
index 80c02eca68..49f81b6930 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PollingAdapterMBeanTests-context.xml
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PollingAdapterMBeanTests-context.xml
@@ -14,7 +14,7 @@
 
 	<context:mbean-server id="mbs" />
 	
-	<context:mbean-export server="mbs"/>
+	<context:mbean-export server="mbs" default-domain="spring.application"/>
 
 	<int:channel id="testChannel" />
 	
@@ -25,6 +25,6 @@
 	
 	<int:logging-channel-adapter channel="testChannel"/>
 	
-	<jmx:mbean-export server="mbs"/>
+	<jmx:mbean-export id="integrationMbeanExporter" server="mbs"/>
 
 </beans>
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PollingAdapterMBeanTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PollingAdapterMBeanTests.java
index 47cfb3c5cf..0455801f96 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PollingAdapterMBeanTests.java
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PollingAdapterMBeanTests.java
@@ -15,7 +15,10 @@ package org.springframework.integration.jmx.config;
 
 import static org.junit.Assert.assertEquals;
 
+import java.util.Set;
+
 import javax.management.MBeanServer;
+import javax.management.ObjectName;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -37,10 +40,12 @@ public class PollingAdapterMBeanTests {
 	private ApplicationContext context;
 
 	@Test
-	public void testMBeanExporterExists() throws InterruptedException {
+	public void testMBeanExporterExists() throws Exception {
 		IntegrationMBeanExporter exporter = this.context.getBean(IntegrationMBeanExporter.class);
 		MBeanServer server = this.context.getBean("mbs", MBeanServer.class);
 		assertEquals(server, exporter.getServer());
+		Set<ObjectName> names = server.queryNames(new ObjectName("spring.application:type=MessageSource,*"), null);
+		assertEquals(1, names.size());
 		exporter.destroy();
 	}