diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-data-gemfire-2.0.xsd b/src/main/resources/org/springframework/data/gemfire/config/spring-data-gemfire-2.0.xsd
index d4e5b057..04b75feb 100644
--- a/src/main/resources/org/springframework/data/gemfire/config/spring-data-gemfire-2.0.xsd
+++ b/src/main/resources/org/springframework/data/gemfire/config/spring-data-gemfire-2.0.xsd
@@ -9,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/gemfire"
 				schemaLocation="https://www.springframework.org/schema/gemfire/spring-gemfire.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-gemfire-2.1.xsd b/src/main/resources/org/springframework/data/gemfire/config/spring-data-gemfire-2.1.xsd
index 24a41874..e2ccffeb 100644
--- a/src/main/resources/org/springframework/data/gemfire/config/spring-data-gemfire-2.1.xsd
+++ b/src/main/resources/org/springframework/data/gemfire/config/spring-data-gemfire-2.1.xsd
@@ -10,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/gemfire"
 				schemaLocation="https://www.springframework.org/schema/gemfire/spring-gemfire.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-gemfire-2.0.xsd b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-2.0.xsd
index 2f748443..5232792c 100644
--- a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-2.0.xsd
+++ b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-2.0.xsd
@@ -7,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-gemfire-2.1.xsd b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-2.1.xsd
index a9ded410..3be167e6 100644
--- a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-2.1.xsd
+++ b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-2.1.xsd
@@ -7,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>