diff --git a/src/main/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBean.java b/src/main/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBean.java
index a0ab9f41..b819b7cf 100644
--- a/src/main/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBean.java
@@ -93,7 +93,7 @@ public class GatewayReceiverFactoryBean extends AbstractWANComponentFactoryBean<
 		}
 
 		if (StringUtils.hasText(hostnameForSenders)) {
-			gatewayReceiverFactory.setHostnameForSenders(hostnameForSenders);
+			gatewayReceiverFactory.setHostnameForClients(hostnameForSenders);
 		}
 
 		int localStartPort = (startPort != null ? startPort : GatewayReceiver.DEFAULT_START_PORT);
diff --git a/src/test/java/org/springframework/data/gemfire/test/StubGatewayReceiverFactory.java b/src/test/java/org/springframework/data/gemfire/test/StubGatewayReceiverFactory.java
index eb0cbb1b..95466895 100644
--- a/src/test/java/org/springframework/data/gemfire/test/StubGatewayReceiverFactory.java
+++ b/src/test/java/org/springframework/data/gemfire/test/StubGatewayReceiverFactory.java
@@ -122,8 +122,7 @@ public class StubGatewayReceiverFactory implements GatewayReceiverFactory {
 		when(gatewayReceiver.getBindAddress()).thenReturn(this.bindAddress);
 		when(gatewayReceiver.getEndPort()).thenReturn(this.endPort);
 		when(gatewayReceiver.getGatewayTransportFilters()).thenReturn(this.gatewayTransportFilters);
-		when(gatewayReceiver.getHost()).thenReturn(StringUtils.hasText(this.hostnameForSenders)
-			? this.hostnameForSenders : this.hostnameForClients);
+		when(gatewayReceiver.getHost()).thenReturn(this.hostnameForClients);
 		when(gatewayReceiver.getMaximumTimeBetweenPings()).thenReturn(this.maximumTimeBetweenPings);
 		when(gatewayReceiver.getSocketBufferSize()).thenReturn(this.socketBufferSize);
 		when(gatewayReceiver.getStartPort()).thenReturn(this.startPort);
diff --git a/src/test/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBeanTest.java
index 208e678b..627508be 100644
--- a/src/test/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBeanTest.java
+++ b/src/test/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBeanTest.java
@@ -35,7 +35,8 @@ import com.gemstone.gemfire.cache.wan.GatewayTransportFilter;
  * The GatewayReceiverFactoryBeanTest class...
  *
  * @author John Blum
- * @see org.springframework.data.gemfire.
+ * @see com.gemstone.gemfire.cache.Cache
+ * @see com.gemstone.gemfire.cache.wan.GatewayReceiverFactory
  * @since 1.5.0
  */
 public class GatewayReceiverFactoryBeanTest {
@@ -62,7 +63,7 @@ public class GatewayReceiverFactoryBeanTest {
 		factoryBean.afterPropertiesSet();
 
 		verify(mockGatewayReceiverFactory).setBindAddress(eq("10.224.112.77"));
-		verify(mockGatewayReceiverFactory).setHostnameForSenders(eq("skullbox"));
+		verify(mockGatewayReceiverFactory).setHostnameForClients(eq("skullbox"));
 		verify(mockGatewayReceiverFactory).setStartPort(eq(2048));
 		verify(mockGatewayReceiverFactory).setEndPort(eq(4096));
 		verify(mockGatewayReceiverFactory).setMaximumTimeBetweenPings(eq(5000));
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 944f9edf..e520e34f 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
@@ -18,8 +18,7 @@
 	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<gfe:gateway-receiver id="Default" bind-address="192.168.0.1" hostname-for-senders="skullbox"
-						  start-port="12345" end-port="54321" manual-start="true"
-						  maximum-time-between-pings="5000" socket-buffer-size="32768"/>
+						  start-port="12345" end-port="54321" maximum-time-between-pings="5000" socket-buffer-size="32768"/>
 
 	<gfe:gateway-receiver id="Auto" manual-start="false"/>
 
diff --git a/src/test/resources/org/springframework/data/gemfire/config/gateway-v7-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/gateway-v7-ns.xml
index 35086866..45200a85 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/gateway-v7-ns.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/gateway-v7-ns.xml
@@ -10,9 +10,12 @@
 " default-lazy-init="true">
 
 	<util:properties id="gemfireProperties">
+		<prop key="name">GemfireV7GatewayNamespaceTest</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">config</prop>
 	</util:properties>
 
-	<gfe:cache/>
+	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<gfe:partitioned-region id="region-inner-gateway-sender" >
         <gfe:gateway-sender remote-distributed-system-id="1"