diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-2.0.xsd b/src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-2.0.xsd
index de967fec..649a56e5 100644
--- a/src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-2.0.xsd
+++ b/src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-2.0.xsd
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <xsd:schema xmlns="http://www.springframework.org/schema/data/geode"
-			xmlns:beans="http://www.springframework.org/schema/beans"
 			xmlns:context="http://www.springframework.org/schema/context"
 			xmlns:gfe="http://www.springframework.org/schema/geode"
 			xmlns:repository="http://www.springframework.org/schema/data/repository"
@@ -10,14 +9,16 @@
 			elementFormDefault="qualified"
 			attributeFormDefault="unqualified"
 			version="2.0">
-	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
+
 	<xsd:import namespace="http://www.springframework.org/schema/context"
 				schemaLocation="https://www.springframework.org/schema/context/spring-context.xsd" />
 	<xsd:import namespace="http://www.springframework.org/schema/data/repository"
 				schemaLocation="https://www.springframework.org/schema/data/repository/spring-repository.xsd"/>
 	<xsd:import namespace="http://www.springframework.org/schema/geode"
 				schemaLocation="https://www.springframework.org/schema/geode/spring-geode.xsd"/>
-	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
+	<xsd:import namespace="http://www.springframework.org/schema/tool"
+				schemaLocation="https://www.springframework.org/schema/tool/spring-tool.xsd"/>
+
 	<!-- -->
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-2.1.xsd b/src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-2.1.xsd
index d91b6723..7fa02c5f 100644
--- a/src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-2.1.xsd
+++ b/src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-2.1.xsd
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <xsd:schema xmlns="http://www.springframework.org/schema/data/geode"
-			xmlns:beans="http://www.springframework.org/schema/beans"
 			xmlns:context="http://www.springframework.org/schema/context"
 			xmlns:gfe="http://www.springframework.org/schema/geode"
 			xmlns:repository="http://www.springframework.org/schema/data/repository"
@@ -11,14 +10,14 @@
 			attributeFormDefault="unqualified"
 			version="2.1">
 
-	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
 	<xsd:import namespace="http://www.springframework.org/schema/context"
 				schemaLocation="https://www.springframework.org/schema/context/spring-context.xsd" />
 	<xsd:import namespace="http://www.springframework.org/schema/data/repository"
 				schemaLocation="https://www.springframework.org/schema/data/repository/spring-repository.xsd"/>
 	<xsd:import namespace="http://www.springframework.org/schema/geode"
 				schemaLocation="https://www.springframework.org/schema/geode/spring-geode.xsd"/>
-	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
+	<xsd:import namespace="http://www.springframework.org/schema/tool"
+				schemaLocation="https://www.springframework.org/schema/tool/spring-tool.xsd"/>
 
 	<!-- -->
 	<xsd:annotation>
diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-geode-2.0.xsd b/src/main/resources/org/springframework/data/gemfire/config/spring-geode-2.0.xsd
index f13bb4b8..7720aadf 100644
--- a/src/main/resources/org/springframework/data/gemfire/config/spring-geode-2.0.xsd
+++ b/src/main/resources/org/springframework/data/gemfire/config/spring-geode-2.0.xsd
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <xsd:schema xmlns="http://www.springframework.org/schema/geode"
-			xmlns:beans="http://www.springframework.org/schema/beans"
-			xmlns:context="http://www.springframework.org/schema/context"
-			xmlns:repository="http://www.springframework.org/schema/data/repository"
 			xmlns:tool="http://www.springframework.org/schema/tool"
 			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
 			targetNamespace="http://www.springframework.org/schema/geode"
@@ -10,9 +7,8 @@
 			attributeFormDefault="unqualified"
 			version="2.0">
 
-	<xsd:import namespace="http://www.springframework.org/schema/beans" />
-	<xsd:import namespace="http://www.springframework.org/schema/context" />
-	<xsd:import namespace="http://www.springframework.org/schema/tool" />
+	<xsd:import namespace="http://www.springframework.org/schema/tool"
+				schemaLocation="https://www.springframework.org/schema/tool/spring-tool.xsd"/>
 
 	<!-- -->
 	<xsd:annotation>
diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-geode-2.1.xsd b/src/main/resources/org/springframework/data/gemfire/config/spring-geode-2.1.xsd
index 6387e186..82b55ce1 100644
--- a/src/main/resources/org/springframework/data/gemfire/config/spring-geode-2.1.xsd
+++ b/src/main/resources/org/springframework/data/gemfire/config/spring-geode-2.1.xsd
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <xsd:schema xmlns="http://www.springframework.org/schema/geode"
-			xmlns:beans="http://www.springframework.org/schema/beans"
-			xmlns:context="http://www.springframework.org/schema/context"
-			xmlns:repository="http://www.springframework.org/schema/data/repository"
 			xmlns:tool="http://www.springframework.org/schema/tool"
 			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
 			targetNamespace="http://www.springframework.org/schema/geode"
@@ -10,9 +7,8 @@
 			attributeFormDefault="unqualified"
 			version="2.1">
 
-	<xsd:import namespace="http://www.springframework.org/schema/beans" />
-	<xsd:import namespace="http://www.springframework.org/schema/context" />
-	<xsd:import namespace="http://www.springframework.org/schema/tool" />
+	<xsd:import namespace="http://www.springframework.org/schema/tool"
+				schemaLocation="https://www.springframework.org/schema/tool/spring-tool.xsd"/>
 
 	<!-- -->
 	<xsd:annotation>