diff --git a/gradle.properties b/gradle.properties
index 32bb2e1c..9ecbf955 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ antlrVersion=2.7.7
 aspectjVersion=1.8.9
 assertjVersion=3.5.2
 cdiVersion=1.0
-gemfireVersion=1.0.0-incubating
+gemfireVersion=1.1.0-incubating-SNAPSHOT
 googleCodeFindbugsVersion=2.0.2
 hamcrestVersion=1.3
 jacksonVersion=2.7.6
@@ -20,4 +20,4 @@ springVersion=4.3.3.RELEASE
 springDataBuildVersion=1.8.4.RELEASE
 springDataCommonsVersion=1.12.4.RELEASE
 springShellVersion=1.1.0.RELEASE
-version=1.0.0.INCUBATING-RELEASE
+version=1.1.0.INCUBATING-SNAPSHOT
diff --git a/pom.xml b/pom.xml
index 12541525..8414b9d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-geode</artifactId>
-	<version>1.0.0.INCUBATING-RELEASE</version>
+	<version>1.1.0.INCUBATING-SNAPSHOT</version>
 
 	<name>Spring Data Geode</name>
 
@@ -22,7 +22,7 @@
 		<antlr.version>2.7.7</antlr.version>
 		<apache-shiro.version>1.3.2</apache-shiro.version>
 		<assertj.version>3.5.2</assertj.version>
-		<gemfire.version>1.0.0-incubating</gemfire.version>
+		<gemfire.version>1.1.0-incubating-SNAPSHOT</gemfire.version>
 		<google-code-findbugs.version>2.0.2</google-code-findbugs.version>
 		<multithreadedtc.version>1.01</multithreadedtc.version>
 		<servlet-api.version>2.5</servlet-api.version>
diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/ApacheShiroSecurityConfiguration.java b/src/main/java/org/springframework/data/gemfire/config/annotation/ApacheShiroSecurityConfiguration.java
index 1fa2ff12..a4b4d9df 100644
--- a/src/main/java/org/springframework/data/gemfire/config/annotation/ApacheShiroSecurityConfiguration.java
+++ b/src/main/java/org/springframework/data/gemfire/config/annotation/ApacheShiroSecurityConfiguration.java
@@ -210,11 +210,11 @@ public class ApacheShiroSecurityConfiguration implements BeanFactoryAware {
 
 		if (securityService != null) {
 			Field isIntegratedSecurity = ReflectionUtils.findField(securityService.getClass(),
-				"isIntegratedSecurity", Boolean.TYPE);
+				"isIntegratedSecurity", Boolean.class);
 
 			if (isIntegratedSecurity != null) {
 				ReflectionUtils.makeAccessible(isIntegratedSecurity);
-				ReflectionUtils.setField(isIntegratedSecurity, securityService, true);
+				ReflectionUtils.setField(isIntegratedSecurity, securityService, Boolean.TRUE);
 
 				return true;
 			}
diff --git a/src/test/java/org/springframework/data/gemfire/GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationTests.java
index bc2b31cd..94ef415c 100644
--- a/src/test/java/org/springframework/data/gemfire/GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationTests.java
+++ b/src/test/java/org/springframework/data/gemfire/GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationTests.java
@@ -183,8 +183,7 @@ public class GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationT
 			serverOnePool.setReadTimeout(Long.valueOf(TimeUnit.SECONDS.toMillis(20)).intValue());
 			serverOnePool.setRetryAttempts(1);
 			serverOnePool.setServerGroup("serverOne");
-			//serverOnePool.setLocators(ConnectionEndpointList.from(newConnectionEndpoint("localhost", 11235)));
-			serverOnePool.setServers(ConnectionEndpointList.from(newConnectionEndpoint("localhost", 41414)));
+			serverOnePool.setLocators(ConnectionEndpointList.from(newConnectionEndpoint("localhost", 11235)));
 
 			return serverOnePool;
 		}
@@ -198,8 +197,7 @@ public class GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationT
 			serverOnePool.setReadTimeout(Long.valueOf(TimeUnit.SECONDS.toMillis(20)).intValue());
 			serverOnePool.setRetryAttempts(1);
 			serverOnePool.setServerGroup("serverTwo");
-			//serverOnePool.setLocators(ConnectionEndpointList.from(newConnectionEndpoint("localhost", 11235)));
-			serverOnePool.setServers(ConnectionEndpointList.from(newConnectionEndpoint("localhost", 42424)));
+			serverOnePool.setLocators(ConnectionEndpointList.from(newConnectionEndpoint("localhost", 11235)));
 
 			return serverOnePool;
 		}
@@ -256,10 +254,9 @@ public class GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationT
 				.setProperty("name", applicationName())
 				.setProperty("mcast-port", "0")
 				.setProperty("log-level", logLevel())
-				//.setProperty("locators", "localhost[11235]")
-				//.setProperty("enable-cluster-configuration", enableClusterConfiguration())
+				.setProperty("locators", "localhost[11235]")
 				.setProperty("groups", groups())
-				//.setProperty("start-locator", startLocator())
+				.setProperty("start-locator", startLocator())
 				.build();
 		}
 
@@ -269,10 +266,6 @@ public class GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationT
 
 		abstract String groups();
 
-		boolean enableClusterConfiguration() {
-			return false;
-		}
-
 		String logLevel() {
 			return System.getProperty("gemfire.log.level", DEFAULT_GEMFIRE_LOG_LEVEL);
 		}
@@ -314,11 +307,6 @@ public class GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationT
 		@Resource(name = "Cats")
 		private org.apache.geode.cache.Region<String, Cat> cats;
 
-		@Override
-		boolean enableClusterConfiguration() {
-			return true;
-		}
-
 		Cat save(Cat cat) {
 			cats.put(cat.getName(), cat);
 			return cat;