diff --git a/src/main/resources/org/springframework/data/jpa/repository/config/spring-jpa-1.0.xsd b/src/main/resources/org/springframework/data/jpa/repository/config/spring-jpa-1.0.xsd
index 1462f7aab..f4de0a92e 100644
--- a/src/main/resources/org/springframework/data/jpa/repository/config/spring-jpa-1.0.xsd
+++ b/src/main/resources/org/springframework/data/jpa/repository/config/spring-jpa-1.0.xsd
@@ -8,8 +8,7 @@
 	elementFormDefault="qualified" attributeFormDefault="unqualified">
 
 	<xsd:import namespace="http://www.springframework.org/schema/tool" />
-	<xsd:import namespace="http://www.springframework.org/schema/context"
-		schemaLocation="http://www.springframework.org/schema/context/spring-context.xsd" />
+	<xsd:import namespace="http://www.springframework.org/schema/context" />
 	<xsd:import namespace="http://www.springframework.org/schema/data/repository"
 		schemaLocation="http://www.springframework.org/schema/data/repository/spring-repository-1.0.xsd" />
 
diff --git a/src/main/resources/org/springframework/data/jpa/repository/config/spring-jpa-1.1.xsd b/src/main/resources/org/springframework/data/jpa/repository/config/spring-jpa-1.1.xsd
index eb4ff1f78..a575da014 100644
--- a/src/main/resources/org/springframework/data/jpa/repository/config/spring-jpa-1.1.xsd
+++ b/src/main/resources/org/springframework/data/jpa/repository/config/spring-jpa-1.1.xsd
@@ -8,8 +8,7 @@
 	elementFormDefault="qualified" attributeFormDefault="unqualified">
 
 	<xsd:import namespace="http://www.springframework.org/schema/tool" />
-	<xsd:import namespace="http://www.springframework.org/schema/context"
-		schemaLocation="http://www.springframework.org/schema/context/spring-context.xsd" />
+	<xsd:import namespace="http://www.springframework.org/schema/context" />
 	<xsd:import namespace="http://www.springframework.org/schema/data/repository"
 		schemaLocation="http://www.springframework.org/schema/data/repository/spring-repository-1.0.xsd" />
 
diff --git a/src/main/resources/org/springframework/data/jpa/repository/config/spring-jpa-1.2.xsd b/src/main/resources/org/springframework/data/jpa/repository/config/spring-jpa-1.2.xsd
index 8aebea806..cf830619a 100644
--- a/src/main/resources/org/springframework/data/jpa/repository/config/spring-jpa-1.2.xsd
+++ b/src/main/resources/org/springframework/data/jpa/repository/config/spring-jpa-1.2.xsd
@@ -8,8 +8,7 @@
 	elementFormDefault="qualified" attributeFormDefault="unqualified">
 
 	<xsd:import namespace="http://www.springframework.org/schema/tool" />
-	<xsd:import namespace="http://www.springframework.org/schema/context"
-		schemaLocation="http://www.springframework.org/schema/context/spring-context.xsd" />
+	<xsd:import namespace="http://www.springframework.org/schema/context" />
 	<xsd:import namespace="http://www.springframework.org/schema/data/repository"
 		schemaLocation="http://www.springframework.org/schema/data/repository/spring-repository.xsd" />
 
diff --git a/src/main/resources/org/springframework/data/jpa/repository/config/spring-jpa-1.3.xsd b/src/main/resources/org/springframework/data/jpa/repository/config/spring-jpa-1.3.xsd
index 7e8b15b1a..7eac039c2 100644
--- a/src/main/resources/org/springframework/data/jpa/repository/config/spring-jpa-1.3.xsd
+++ b/src/main/resources/org/springframework/data/jpa/repository/config/spring-jpa-1.3.xsd
@@ -7,10 +7,8 @@
 	targetNamespace="http://www.springframework.org/schema/data/jpa"
 	elementFormDefault="qualified" attributeFormDefault="unqualified">
 
-	<xsd:import namespace="http://www.springframework.org/schema/tool" 
-		schemaLocation="http://www.springframework.org/schema/tool/spring-tool.xsd"/>
-	<xsd:import namespace="http://www.springframework.org/schema/context"
-		schemaLocation="http://www.springframework.org/schema/context/spring-context.xsd" />
+	<xsd:import namespace="http://www.springframework.org/schema/tool" />
+	<xsd:import namespace="http://www.springframework.org/schema/context" />
 	<xsd:import namespace="http://www.springframework.org/schema/data/repository"
 		schemaLocation="http://www.springframework.org/schema/data/repository/spring-repository.xsd" />