diff --git a/.gitignore b/.gitignore
index 52fa69ee..cedc7626 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@ pom.xml
 .settings/
 .idea/
 _site/
+.bak/
 
 /samples/hello-world/vf.gf.dmn-events.cfg
 /samples/hello-world/vf.gf.dmn-license.cfg
diff --git a/gradle.properties b/gradle.properties
index 8114ad36..d2457d79 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,8 +2,8 @@ slf4jVersion=1.6.4
 junitVersion=4.8.2
 gemfireVersion=7.0.1
 spring.range="[3.2.0, 4.0.0)"
-springVersion=3.2.5.RELEASE
-springDataCommonsVersion=1.5.3.RELEASE
+springVersion=3.2.8.RELEASE
+springDataCommonsVersion=1.7.1.RELEASE
 log4jVersion=1.2.16
 hamcrestVersion=1.2.1
 version=1.3.3.RELEASE
diff --git a/src/test/java/org/springframework/data/gemfire/repository/config/GemfireRepositoriesRegistrarIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/repository/config/GemfireRepositoriesRegistrarIntegrationTest.java
index dfb17a95..dc6f8707 100644
--- a/src/test/java/org/springframework/data/gemfire/repository/config/GemfireRepositoriesRegistrarIntegrationTest.java
+++ b/src/test/java/org/springframework/data/gemfire/repository/config/GemfireRepositoriesRegistrarIntegrationTest.java
@@ -20,7 +20,9 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.data.gemfire.CacheFactoryBean;
 import org.springframework.data.gemfire.LocalRegionFactoryBean;
 import org.springframework.data.gemfire.repository.sample.Person;
@@ -44,7 +46,9 @@ import com.gemstone.gemfire.cache.Region;
 public class GemfireRepositoriesRegistrarIntegrationTest {
 
 	@Configuration
-	@EnableGemfireRepositories("org.springframework.data.gemfire.repository.sample")
+	@EnableGemfireRepositories(value = "org.springframework.data.gemfire.repository.sample",
+		includeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE,
+			value = org.springframework.data.gemfire.repository.sample.PersonRepository.class))
 	static class Config {
 
 		@Bean
@@ -73,4 +77,4 @@ public class GemfireRepositoriesRegistrarIntegrationTest {
 	public void bootstrapsRepositoriesCorrectly() {
 
 	}
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/org/springframework/data/gemfire/client/datasource-client-with-regions.xml b/src/test/resources/org/springframework/data/gemfire/client/datasource-client-with-regions.xml
index c74fc406..4739ea1e 100644
--- a/src/test/resources/org/springframework/data/gemfire/client/datasource-client-with-regions.xml
+++ b/src/test/resources/org/springframework/data/gemfire/client/datasource-client-with-regions.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	default-lazy-init="true"
-	xmlns:gfe-data="http://www.springframework.org/schema/data/gemfire"
-	xmlns:gfe="http://www.springframework.org/schema/gemfire"
-	xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire-1.3.xsd
+	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:gfe-data="http://www.springframework.org/schema/data/gemfire"
+	   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/data/gemfire http://www.springframework.org/schema/data/gemfire/spring-data-gemfire-1.3.xsd">
+	   	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire-1.3.xsd
+		http://www.springframework.org/schema/data/gemfire http://www.springframework.org/schema/data/gemfire/spring-data-gemfire-1.3.xsd
+" default-lazy-init="true">
 	
 	<gfe-data:datasource>
 		<gfe-data:server host="localhost" port="40404"/>
 	</gfe-data:datasource>
 	
 	<gfe:client-region id="simple" shortcut="CACHING_PROXY"/>
-	
-	<gfe-data:repositories base-package="org.springframework.data.gemfire.repository.sample"/>
+
 </beans>
diff --git a/src/test/resources/org/springframework/data/gemfire/client/datasource-client.xml b/src/test/resources/org/springframework/data/gemfire/client/datasource-client.xml
index 40d40998..0c3e0cb8 100644
--- a/src/test/resources/org/springframework/data/gemfire/client/datasource-client.xml
+++ b/src/test/resources/org/springframework/data/gemfire/client/datasource-client.xml
@@ -1,13 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	default-lazy-init="true"
-	xmlns:gfe-data="http://www.springframework.org/schema/data/gemfire"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/data/gemfire http://www.springframework.org/schema/data/gemfire/spring-data-gemfire-1.3.xsd">
-	
+	   xmlns:gfe-data="http://www.springframework.org/schema/data/gemfire"
+	   xmlns:repo="http://www.springframework.org/schema/data/repository"
+	   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/data/gemfire http://www.springframework.org/schema/data/gemfire/spring-data-gemfire-1.3.xsd
+		http://www.springframework.org/schema/data/repository http://www.springframework.org/schema/data/repository/spring-repository.xsd
+" default-lazy-init="true">
+
 	<gfe-data:datasource>
 		<gfe-data:server host="localhost" port="40404"/>
 	</gfe-data:datasource>
-	<gfe-data:repositories base-package="org.springframework.data.gemfire.repository.sample"/>
+
+	<gfe-data:repositories base-package="org.springframework.data.gemfire.repository.sample">
+		<repo:include-filter type="assignable" expression="org.springframework.data.gemfire.repository.sample.PersonRepository"/>
+	</gfe-data:repositories>
+
 </beans>
diff --git a/src/test/resources/org/springframework/data/gemfire/repository/config/RepositoryClientRegionTests-context.xml b/src/test/resources/org/springframework/data/gemfire/repository/config/RepositoryClientRegionTests-context.xml
index 724186e4..159a9c97 100644
--- a/src/test/resources/org/springframework/data/gemfire/repository/config/RepositoryClientRegionTests-context.xml
+++ b/src/test/resources/org/springframework/data/gemfire/repository/config/RepositoryClientRegionTests-context.xml
@@ -1,12 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:gfe-data="http://www.springframework.org/schema/data/gemfire"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/data/gemfire http://www.springframework.org/schema/data/gemfire/spring-data-gemfire.xsd">
+	   xmlns:gfe-data="http://www.springframework.org/schema/data/gemfire"
+	   xmlns:repo="http://www.springframework.org/schema/data/repository"
+	   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/data/gemfire http://www.springframework.org/schema/data/gemfire/spring-data-gemfire.xsd
+		http://www.springframework.org/schema/data/repository http://www.springframework.org/schema/data/repository/spring-repository.xsd
+">
 
 	<gfe-data:datasource>
 		<gfe-data:server host="localhost" port="40404"/>
 	</gfe-data:datasource>
-	<gfe-data:repositories base-package="org.springframework.data.gemfire.repository.sample"/>
+
+	<gfe-data:repositories base-package="org.springframework.data.gemfire.repository.sample">
+		<repo:include-filter type="assignable" expression="org.springframework.data.gemfire.repository.sample.PersonRepository"/>
+	</gfe-data:repositories>
+
 </beans>
diff --git a/src/test/resources/org/springframework/data/gemfire/repository/config/partitioned-region-repo-context.xml b/src/test/resources/org/springframework/data/gemfire/repository/config/partitioned-region-repo-context.xml
index df12ce2e..c7b57eee 100644
--- a/src/test/resources/org/springframework/data/gemfire/repository/config/partitioned-region-repo-context.xml
+++ b/src/test/resources/org/springframework/data/gemfire/repository/config/partitioned-region-repo-context.xml
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:p="http://www.springframework.org/schema/p"
-    xmlns:gfe="http://www.springframework.org/schema/gemfire"
-    xmlns:gfe-data="http://www.springframework.org/schema/data/gemfire"
-    xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:gfe-data="http://www.springframework.org/schema/data/gemfire"
+	   xmlns:repo="http://www.springframework.org/schema/data/repository"
+	   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/data/gemfire http://www.springframework.org/schema/data/gemfire/spring-data-gemfire-1.2.xsd">
+	   	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/data/gemfire http://www.springframework.org/schema/data/gemfire/spring-data-gemfire-1.2.xsd
+		http://www.springframework.org/schema/data/repository http://www.springframework.org/schema/data/repository/spring-repository.xsd
+">
+
+	<gfe:cache use-bean-factory-locator="false"/>
+
+	<gfe:partitioned-region id="simple"/>
+
+	<gfe-data:repositories base-package="org.springframework.data.gemfire.repository.sample">
+		<repo:include-filter type="assignable" expression="org.springframework.data.gemfire.repository.sample.PersonRepository"/>
+	</gfe-data:repositories>
 
-	<gfe-data:repositories base-package="org.springframework.data.gemfire.repository.sample" />
-	
-	<gfe:cache use-bean-factory-locator="false" />	
-	<gfe:partitioned-region id="simple" />	
 </beans>
diff --git a/src/test/resources/org/springframework/data/gemfire/repository/config/repo-context.xml b/src/test/resources/org/springframework/data/gemfire/repository/config/repo-context.xml
index 515f9105..6cdf58ca 100644
--- a/src/test/resources/org/springframework/data/gemfire/repository/config/repo-context.xml
+++ b/src/test/resources/org/springframework/data/gemfire/repository/config/repo-context.xml
@@ -1,17 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:p="http://www.springframework.org/schema/p"
-    xmlns:gfe="http://www.springframework.org/schema/gemfire"
-    xmlns:gfe-data="http://www.springframework.org/schema/data/gemfire"
-    xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:gfe-data="http://www.springframework.org/schema/data/gemfire"
+	   xmlns:repo="http://www.springframework.org/schema/data/repository"
+	   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/data/gemfire http://www.springframework.org/schema/data/gemfire/spring-data-gemfire.xsd">
+    	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/data/gemfire http://www.springframework.org/schema/data/gemfire/spring-data-gemfire.xsd
+		http://www.springframework.org/schema/data/repository http://www.springframework.org/schema/data/repository/spring-repository.xsd
+">
 
-	<gfe-data:repositories base-package="org.springframework.data.gemfire.repository.sample"/>
-	
 	<gfe:cache use-bean-factory-locator="false" />
+
 	<gfe:replicated-region id="simple" />
     <gfe:replicated-region id="person"/>
     <gfe:replicated-region id="address"/>
+
+	<gfe-data:repositories base-package="org.springframework.data.gemfire.repository.sample">
+		<repo:include-filter type="assignable" expression="org.springframework.data.gemfire.repository.sample.PersonRepository"/>
+	</gfe-data:repositories>
+
 </beans>
diff --git a/src/test/resources/org/springframework/data/gemfire/repository/sample/userRepositoryQueriesIntegrationTest.xml b/src/test/resources/org/springframework/data/gemfire/repository/sample/userRepositoryQueriesIntegrationTest.xml
index 332a09ea..e7b8222c 100644
--- a/src/test/resources/org/springframework/data/gemfire/repository/sample/userRepositoryQueriesIntegrationTest.xml
+++ b/src/test/resources/org/springframework/data/gemfire/repository/sample/userRepositoryQueriesIntegrationTest.xml
@@ -2,27 +2,29 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
 	   xmlns:gfe-data="http://www.springframework.org/schema/data/gemfire"
+	   xmlns:repo="http://www.springframework.org/schema/data/repository"
 	   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
         http://www.springframework.org/schema/data/gemfire http://www.springframework.org/schema/data/gemfire/spring-data-gemfire.xsd
+		http://www.springframework.org/schema/data/repository http://www.springframework.org/schema/data/repository/spring-repository.xsd
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
 	<util:properties id="peerCacheConfigurationSettings">
 		<prop key="name">repositoryQueriesTest</prop>
-		<prop key="locators">localhost[11235]</prop>
 		<prop key="log-level">config</prop>
 		<prop key="mcast-port">0</prop>
-		<prop key="start-locator">localhost[11235]</prop>
 	</util:properties>
 
 	<gfe:cache/>
 
 	<gfe:replicated-region id="Users" persistent="false"/>
 
-	<gfe-data:repositories base-package="org.springframework.data.gemfire.repository.sample"/>
+	<gfe-data:repositories base-package="org.springframework.data.gemfire.repository.sample">
+		<repo:include-filter type="assignable" expression="org.springframework.data.gemfire.repository.sample.UserRepository"/>
+	</gfe-data:repositories>
 
 </beans>