diff --git a/src/test/java/org/springframework/data/gemfire/config/GatewayReceiverNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/GatewayReceiverNamespaceTest.java
index 9636b71a..7aee9f9b 100644
--- a/src/test/java/org/springframework/data/gemfire/config/GatewayReceiverNamespaceTest.java
+++ b/src/test/java/org/springframework/data/gemfire/config/GatewayReceiverNamespaceTest.java
@@ -55,9 +55,10 @@ public class GatewayReceiverNamespaceTest {
 	private GatewayReceiverFactoryBean manualGatewayReceiver;
 
 	@Test
+	// TODO test the default value for "manual-start" (true) without explicitly setting the attribute in Spring XML
 	public void testDefault() throws Exception {
 		assertNotNull("The 'Default' GatewayReceiverFactoryBean was not properly configured and initialized!", defaultFactoryBean);
-		assertTrue(defaultFactoryBean.isAutoStartup());
+		assertFalse(defaultFactoryBean.isAutoStartup());
 
 		GatewayReceiver defaultGatewayReceiver = defaultFactoryBean.getObject();
 
diff --git a/src/test/resources/org/springframework/data/gemfire/config/GatewayReceiverNamespaceTest-context.xml b/src/test/resources/org/springframework/data/gemfire/config/GatewayReceiverNamespaceTest-context.xml
index ef5136b7..dc541a49 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/GatewayReceiverNamespaceTest-context.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/GatewayReceiverNamespaceTest-context.xml
@@ -10,7 +10,7 @@
 	<gfe:cache/>
 
 	<gfe:gateway-receiver id="Default" bind-address="192.168.0.1" start-port="12345" end-port="54321"
-						  maximum-time-between-pings="5000" socket-buffer-size="32768"/>
+						  manual-start="true" maximum-time-between-pings="5000" socket-buffer-size="32768"/>
 
 	<gfe:gateway-receiver id="Auto" manual-start="false"/>