diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayTests-context.xml b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayTests-context.xml
index 94eca1fc90..b14b2c4a42 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayTests-context.xml
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayTests-context.xml
@@ -24,10 +24,6 @@
 	
 	<si:channel id="withNoReplyChannel"/>
 	
-	<si:channel id="withNoReplyChannelOutput">
-		<si:queue/>
-	</si:channel>
-			
 	<jmx:operation-invoking-outbound-gateway request-channel="withReplyChannel"
 			reply-channel="withReplyChannelOutput"
 			object-name="org.springframework.integration.jmx.config:type=TestBean,name=testBeanGateway"
@@ -35,7 +31,7 @@
 
 	<jmx:operation-invoking-outbound-gateway request-channel="withNoReplyChannel"
 			object-name="org.springframework.integration.jmx.config:type=TestBean,name=testBeanGateway"
-			operation-name="testWithReturn"/>
+			operation-name="test"/>
 
 	<bean id="testBeanGateway" class="org.springframework.integration.jmx.config.TestBean"/>
 </beans>
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayTests.java
index 4b0dfe5cd2..13fd515c5d 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayTests.java
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayTests.java
@@ -25,17 +25,14 @@ import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.integration.channel.PollableChannel;
-import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessageChannel;
-import org.springframework.integration.jmx.JmxHeaders;
-import org.springframework.integration.message.MessageBuilder;
 import org.springframework.integration.message.StringMessage;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * @author Oleg Zhurakousky
- *
+ * 
  */
 @ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
@@ -43,17 +40,15 @@ public class OperationInvokingOutboundGatewayTests {
 	@Autowired
 	@Qualifier("withReplyChannel")
 	private MessageChannel withReplyChannel;
+
 	@Autowired
 	@Qualifier("withReplyChannelOutput")
 	private PollableChannel withReplyChannelOutput;
-	
+
 	@Autowired
 	@Qualifier("withNoReplyChannel")
 	private MessageChannel withNoReplyChannel;
-	@Autowired
-	@Qualifier("withNoReplyChannelOutput")
-	private PollableChannel withNoReplyChannelOutput;
-	
+
 	@Autowired
 	private TestBean testBean;
 
@@ -61,34 +56,25 @@ public class OperationInvokingOutboundGatewayTests {
 	public void resetLists() {
 		testBean.messages.clear();
 	}
-	
+
 	@Test
 	public void gatewayWithReplyChannel() throws Exception {
 		withReplyChannel.send(new StringMessage("1"));
-		assertEquals(1, ((List<?>)withReplyChannelOutput.receive().getPayload()).size());
+		assertEquals(1, ((List<?>) withReplyChannelOutput.receive().getPayload()).size());
 		withReplyChannel.send(new StringMessage("2"));
-		assertEquals(2, ((List<?>)withReplyChannelOutput.receive().getPayload()).size());
+		assertEquals(2, ((List<?>) withReplyChannelOutput.receive().getPayload()).size());
 		withReplyChannel.send(new StringMessage("3"));
-		assertEquals(3, ((List<?>)withReplyChannelOutput.receive().getPayload()).size());
+		assertEquals(3, ((List<?>) withReplyChannelOutput.receive().getPayload()).size());
 	}
-	
-//	@Test
-//	public void adapterWithoutNoDefaultsAndReturnAndReplyChannel() throws Exception {
-//		noDefaultInputA.send(createMessageWithHeadersForReturnCaseAndReplyChannel("1", noDefaultOutputA));
-//		assertEquals(1, ((List<?>)noDefaultOutputA.receive().getPayload()).size());
-//		noDefaultInputA.send(createMessageWithHeadersForReturnCaseAndReplyChannel("2", noDefaultOutputA));
-//		assertEquals(2, ((List<?>)noDefaultOutputA.receive().getPayload()).size());
-//		noDefaultInputA.send(createMessageWithHeadersForReturnCaseAndReplyChannel("3", noDefaultOutputA));
-//		assertEquals(3, ((List<?>)noDefaultOutputA.receive().getPayload()).size());
-//	}
-//	
-//	@Test
-//	public void adapterWithoutDefaultsAndReturn() throws Exception {
-//		defaultInput.send(new StringMessage("1"));
-//		assertEquals(1, ((List<?>)defaultOutput.receive().getPayload()).size());
-//		defaultInput.send(new StringMessage("2"));
-//		assertEquals(2, ((List<?>)defaultOutput.receive().getPayload()).size());
-//		defaultInput.send(new StringMessage("3"));
-//		assertEquals(3, ((List<?>)defaultOutput.receive().getPayload()).size());
-//	}
+
+	@Test
+	public void gatewayWithNoReplyChannel() throws Exception {
+		withNoReplyChannel.send(new StringMessage("1"));
+		assertEquals(1, testBean.messages.size());
+		withNoReplyChannel.send(new StringMessage("2"));
+		assertEquals(2, testBean.messages.size());
+		withNoReplyChannel.send(new StringMessage("3"));
+		assertEquals(3, testBean.messages.size());
+	}
+
 }