diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.4.xsd b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.4.xsd
index 200e8b6f..4aafb735 100644
--- a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.4.xsd
+++ b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.4.xsd
@@ -2477,6 +2477,14 @@ The maximum time interval that can elapse before a partial batch is sent from a
             ]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
+		<xsd:attribute name="disk-synchronous" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+For Regions that write to disk, a boolean that specifies whether disk writes are done synchronously (true)
+for the Region or asynchronously (false).
+            	]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
 		<xsd:attribute name="dispatcher-threads" type="xsd:string" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
diff --git a/src/test/java/org/springframework/data/gemfire/config/GemfireV7GatewayNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/GemfireV7GatewayNamespaceTest.java
index db8bd795..a3afb422 100644
--- a/src/test/java/org/springframework/data/gemfire/config/GemfireV7GatewayNamespaceTest.java
+++ b/src/test/java/org/springframework/data/gemfire/config/GemfireV7GatewayNamespaceTest.java
@@ -82,10 +82,9 @@ public class GemfireV7GatewayNamespaceTest extends RecreatingContextTest {
 	@AfterClass
 	public static void tearDown() {
 		for (String name : new File(".").list(new FilenameFilter() {
-
 			@Override
-			public boolean accept(File dir, String name) {
-				return name.startsWith("BACKUP");
+			public boolean accept(File file, String filename) {
+				return filename.startsWith("BACKUP");
 			}
 		})) {
 			new File(name).delete();
@@ -116,6 +115,7 @@ public class GemfireV7GatewayNamespaceTest extends RecreatingContextTest {
 		assertEquals(10, TestUtils.readField("alertThreshold", gatewaySenderFactoryBean));
 		assertEquals(11, TestUtils.readField("batchSize", gatewaySenderFactoryBean));
 		assertEquals(12, TestUtils.readField("dispatcherThreads", gatewaySenderFactoryBean));
+		assertEquals(false, TestUtils.readField("diskSynchronous", gatewaySenderFactoryBean));
 		assertEquals(true, TestUtils.readField("manualStart", gatewaySenderFactoryBean));
 
 		List<GatewayEventFilter> eventFilters = TestUtils.readField("eventFilters", gatewaySenderFactoryBean);
@@ -131,8 +131,8 @@ public class GemfireV7GatewayNamespaceTest extends RecreatingContextTest {
 		assertTrue(transportFilters.get(0) instanceof TestTransportFilter);
 	}
 
-	@SuppressWarnings("rawtypes")
 	@Test
+	@SuppressWarnings("rawtypes")
 	public void testInnerGatewaySender() throws Exception {
 		Region<?, ?> region = ctx.getBean("region-inner-gateway-sender", Region.class);
 
@@ -151,12 +151,13 @@ public class GemfireV7GatewayNamespaceTest extends RecreatingContextTest {
 		assertNotNull(gatewaySender);
 		assertEquals(1, gatewaySender.getRemoteDSId());
 		assertEquals(false, gatewaySender.isManualStart());
-		assertEquals(true,gatewaySender.isRunning());
+		assertEquals(true, gatewaySender.isRunning());
 		assertEquals(10, gatewaySender.getAlertThreshold());
 		assertEquals(11, gatewaySender.getBatchSize());
 		assertEquals(3000, gatewaySender.getBatchTimeInterval());
 		assertEquals(2, gatewaySender.getDispatcherThreads());
 		assertEquals("diskstore", gatewaySender.getDiskStoreName());
+		assertEquals(true, gatewaySender.isDiskSynchronous());
 		assertTrue(gatewaySender.isBatchConflationEnabled());
 		assertEquals(50, gatewaySender.getMaximumQueueMemory());
 		assertEquals(OrderPolicy.THREAD, gatewaySender.getOrderPolicy());
diff --git a/src/test/java/org/springframework/data/gemfire/test/StubGatewaySenderFactory.java b/src/test/java/org/springframework/data/gemfire/test/StubGatewaySenderFactory.java
index 060ead1a..0d03270b 100644
--- a/src/test/java/org/springframework/data/gemfire/test/StubGatewaySenderFactory.java
+++ b/src/test/java/org/springframework/data/gemfire/test/StubGatewaySenderFactory.java
@@ -85,22 +85,28 @@ public class StubGatewaySenderFactory implements GatewaySenderFactory {
 		when(gatewaySender.getId()).thenReturn(this.name);
 		when(gatewaySender.getRemoteDSId()).thenReturn(this.remoteSystemId);
 		when(gatewaySender.getAlertThreshold()).thenReturn(this.alertThreshold);
+		when(gatewaySender.getGatewayEventFilters()).thenReturn(this.eventFilters);
+		when(gatewaySender.getGatewayTransportFilters()).thenReturn(this.transportFilters);
+		when(gatewaySender.isManualStart()).thenReturn(this.manualStart);
+		when(gatewaySender.getSocketBufferSize()).thenReturn(this.socketBufferSize);
+		when(gatewaySender.getSocketReadTimeout()).thenReturn(this.socketReadTimeout);
+		when(gatewaySender.isBatchConflationEnabled()).thenReturn(this.batchConflationEnabled);
 		when(gatewaySender.getBatchSize()).thenReturn(this.batchSize);
 		when(gatewaySender.getBatchTimeInterval()).thenReturn(this.batchTimeInterval);
 		when(gatewaySender.getDiskStoreName()).thenReturn(this.diskStoreName);
-		when(gatewaySender.getDispatcherThreads()).thenReturn(this.dispatcherThreads);
-		when(gatewaySender.getGatewayEventFilters()).thenReturn(this.eventFilters);
-		when(gatewaySender.getGatewayTransportFilters()).thenReturn(this.transportFilters);
-		when(gatewaySender.getMaximumQueueMemory()).thenReturn(this.maxQueueMemory);
-		when(gatewaySender.getOrderPolicy()).thenReturn(this.orderPolicy);
-		when(gatewaySender.getSocketBufferSize()).thenReturn(this.socketBufferSize);
-		when(gatewaySender.getSocketReadTimeout()).thenReturn(this.socketReadTimeout);
-		when(gatewaySender.isManualStart()).thenReturn(this.manualStart);
-		when(gatewaySender.isBatchConflationEnabled()).thenReturn(this.batchConflationEnabled);
 		when(gatewaySender.isDiskSynchronous()).thenReturn(this.diskSynchronous);
+		when(gatewaySender.getDispatcherThreads()).thenReturn(this.dispatcherThreads);
+		when(gatewaySender.getMaximumQueueMemory()).thenReturn(this.maxQueueMemory);
 		when(gatewaySender.isParallel()).thenReturn(this.parallel);
 		when(gatewaySender.isPersistenceEnabled()).thenReturn(this.persistenceEnabled);
-        doAnswer(new Answer<Void>() {
+		when(gatewaySender.getOrderPolicy()).thenReturn(this.orderPolicy);
+		when(gatewaySender.isRunning()).thenAnswer(new Answer<Boolean>() {
+			@Override
+			public Boolean answer(InvocationOnMock invocation) throws Throwable {
+				return running;
+			}
+		});
+		doAnswer(new Answer<Void>() {
             public Void answer(InvocationOnMock invocation) {
                 running = true;
                return null;
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 3ed666f1..35086866 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
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:util="http://www.springframework.org/schema/util"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
-	   " default-lazy-init="true">
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+" default-lazy-init="true">
+
+	<util:properties id="gemfireProperties">
+	</util:properties>
 
 	<gfe:cache/>
 
@@ -17,6 +22,7 @@
 							batch-time-interval="3000"
 							dispatcher-threads="2"
 							disk-store-ref="diskstore"
+							disk-synchronous="true"
 							enable-batch-conflation="true"
 							maximum-queue-memory="50"
 							order-policy="THREAD"
@@ -61,7 +67,7 @@
 
     <!-- need manual-start=true for the unit test because GF will throw an exception if no locators are configured -->
     <gfe:gateway-sender id="gateway-sender" remote-distributed-system-id="2" alert-threshold="10" batch-size="11"
-						dispatcher-threads="12" manual-start="true">
+						dispatcher-threads="12" disk-synchronous="false" manual-start="true">
 		<gfe:event-filter>
 			<ref bean="event-filter"/>
 			<bean class="org.springframework.data.gemfire.config.GemfireV7GatewayNamespaceTest.TestEventFilter"/>