diff --git a/src/test/java/org/springframework/data/elasticsearch/InnerObjectTests.java b/src/test/java/org/springframework/data/elasticsearch/InnerObjectTests.java
index 85a9008b7..8b97e066e 100644
--- a/src/test/java/org/springframework/data/elasticsearch/InnerObjectTests.java
+++ b/src/test/java/org/springframework/data/elasticsearch/InnerObjectTests.java
@@ -25,7 +25,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
-import org.springframework.data.elasticsearch.repositories.SampleElasticSearchBookRepository;
+import org.springframework.data.elasticsearch.repositories.book.SampleElasticSearchBookRepository;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
diff --git a/src/test/java/org/springframework/data/elasticsearch/NonDocumentEntityTests.java b/src/test/java/org/springframework/data/elasticsearch/NonDocumentEntityTests.java
index d461a253f..8242e88bf 100644
--- a/src/test/java/org/springframework/data/elasticsearch/NonDocumentEntityTests.java
+++ b/src/test/java/org/springframework/data/elasticsearch/NonDocumentEntityTests.java
@@ -18,7 +18,7 @@ package org.springframework.data.elasticsearch;
 import org.junit.Test;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.data.elasticsearch.repositories.NonDocumentEntityRepository;
+import org.springframework.data.elasticsearch.repositories.nondocument.NonDocumentEntityRepository;
 
 /**
  * @author Rizwan Idrees
diff --git a/src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchNamespaceHandlerTests.java b/src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchNamespaceHandlerTests.java
index 4e0b33896..15db89a9f 100644
--- a/src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchNamespaceHandlerTests.java
+++ b/src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchNamespaceHandlerTests.java
@@ -25,7 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.data.elasticsearch.client.NodeClientFactoryBean;
 import org.springframework.data.elasticsearch.client.TransportClientFactoryBean;
-import org.springframework.data.elasticsearch.repositories.SampleElasticsearchRepository;
+import org.springframework.data.elasticsearch.repositories.sample.SampleElasticsearchRepository;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
diff --git a/src/test/java/org/springframework/data/elasticsearch/config/EnableElasticsearchRepositoriesTests.java b/src/test/java/org/springframework/data/elasticsearch/config/EnableElasticsearchRepositoriesTests.java
index f7b1431ad..b0442c256 100644
--- a/src/test/java/org/springframework/data/elasticsearch/config/EnableElasticsearchRepositoriesTests.java
+++ b/src/test/java/org/springframework/data/elasticsearch/config/EnableElasticsearchRepositoriesTests.java
@@ -26,7 +26,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
 import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
-import org.springframework.data.elasticsearch.repositories.SampleElasticsearchRepository;
+import org.springframework.data.elasticsearch.repositories.sample.SampleElasticsearchRepository;
 import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -40,7 +40,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 public class EnableElasticsearchRepositoriesTests {
 
 	@Configuration
-	@EnableElasticsearchRepositories(basePackages = "org.springframework.data.elasticsearch.repositories")
+	@EnableElasticsearchRepositories(basePackages = "org.springframework.data.elasticsearch.repositories.sample")
 	static class Config {
 
 		@Bean
diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/CustomMethodRepositoryTests.java b/src/test/java/org/springframework/data/elasticsearch/repositories/CustomMethodRepositoryTests.java
index 0dd2d8d03..7742847ce 100644
--- a/src/test/java/org/springframework/data/elasticsearch/repositories/CustomMethodRepositoryTests.java
+++ b/src/test/java/org/springframework/data/elasticsearch/repositories/CustomMethodRepositoryTests.java
@@ -31,6 +31,7 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.elasticsearch.SampleEntity;
 import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
+import org.springframework.data.elasticsearch.repositories.custom.SampleCustomMethodRepository;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/SampleElasticSearchBookRepository.java b/src/test/java/org/springframework/data/elasticsearch/repositories/book/SampleElasticSearchBookRepository.java
similarity index 90%
rename from src/test/java/org/springframework/data/elasticsearch/repositories/SampleElasticSearchBookRepository.java
rename to src/test/java/org/springframework/data/elasticsearch/repositories/book/SampleElasticSearchBookRepository.java
index bb7b2f7a6..6b202f4df 100644
--- a/src/test/java/org/springframework/data/elasticsearch/repositories/SampleElasticSearchBookRepository.java
+++ b/src/test/java/org/springframework/data/elasticsearch/repositories/book/SampleElasticSearchBookRepository.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.elasticsearch.repositories;
+package org.springframework.data.elasticsearch.repositories.book;
 
 import org.springframework.data.elasticsearch.Book;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/SampleCustomMethodRepository.java b/src/test/java/org/springframework/data/elasticsearch/repositories/custom/SampleCustomMethodRepository.java
similarity index 94%
rename from src/test/java/org/springframework/data/elasticsearch/repositories/SampleCustomMethodRepository.java
rename to src/test/java/org/springframework/data/elasticsearch/repositories/custom/SampleCustomMethodRepository.java
index 8c1b59d9c..b67ba83a9 100644
--- a/src/test/java/org/springframework/data/elasticsearch/repositories/SampleCustomMethodRepository.java
+++ b/src/test/java/org/springframework/data/elasticsearch/repositories/custom/SampleCustomMethodRepository.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.elasticsearch.repositories;
+package org.springframework.data.elasticsearch.repositories.custom;
 
 import java.util.List;
 
diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/DoubleIDRepository.java b/src/test/java/org/springframework/data/elasticsearch/repositories/doubleid/DoubleIDRepository.java
similarity index 92%
rename from src/test/java/org/springframework/data/elasticsearch/repositories/DoubleIDRepository.java
rename to src/test/java/org/springframework/data/elasticsearch/repositories/doubleid/DoubleIDRepository.java
index fdaedaa42..0ab5904e0 100644
--- a/src/test/java/org/springframework/data/elasticsearch/repositories/DoubleIDRepository.java
+++ b/src/test/java/org/springframework/data/elasticsearch/repositories/doubleid/DoubleIDRepository.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.elasticsearch.repositories;
+package org.springframework.data.elasticsearch.repositories.doubleid;
 
 import org.springframework.data.elasticsearch.DoubleIDEntity;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/IntegerIDRepository.java b/src/test/java/org/springframework/data/elasticsearch/repositories/integer/IntegerIDRepository.java
similarity index 93%
rename from src/test/java/org/springframework/data/elasticsearch/repositories/IntegerIDRepository.java
rename to src/test/java/org/springframework/data/elasticsearch/repositories/integer/IntegerIDRepository.java
index a2a4a1113..e01a78064 100644
--- a/src/test/java/org/springframework/data/elasticsearch/repositories/IntegerIDRepository.java
+++ b/src/test/java/org/springframework/data/elasticsearch/repositories/integer/IntegerIDRepository.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.elasticsearch.repositories;
+package org.springframework.data.elasticsearch.repositories.integer;
 
 import org.springframework.data.elasticsearch.IntegerIDEntity;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/NonDocumentEntityRepository.java b/src/test/java/org/springframework/data/elasticsearch/repositories/nondocument/NonDocumentEntityRepository.java
similarity index 90%
rename from src/test/java/org/springframework/data/elasticsearch/repositories/NonDocumentEntityRepository.java
rename to src/test/java/org/springframework/data/elasticsearch/repositories/nondocument/NonDocumentEntityRepository.java
index e766db2da..fe4f1eb24 100644
--- a/src/test/java/org/springframework/data/elasticsearch/repositories/NonDocumentEntityRepository.java
+++ b/src/test/java/org/springframework/data/elasticsearch/repositories/nondocument/NonDocumentEntityRepository.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.elasticsearch.repositories;
+package org.springframework.data.elasticsearch.repositories.nondocument;
 
 import org.springframework.context.annotation.Lazy;
 import org.springframework.data.elasticsearch.NonDocumentEntity;
diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/SampleElasticsearchRepository.java b/src/test/java/org/springframework/data/elasticsearch/repositories/sample/SampleElasticsearchRepository.java
similarity index 90%
rename from src/test/java/org/springframework/data/elasticsearch/repositories/SampleElasticsearchRepository.java
rename to src/test/java/org/springframework/data/elasticsearch/repositories/sample/SampleElasticsearchRepository.java
index 112045f05..26d661e3d 100644
--- a/src/test/java/org/springframework/data/elasticsearch/repositories/SampleElasticsearchRepository.java
+++ b/src/test/java/org/springframework/data/elasticsearch/repositories/sample/SampleElasticsearchRepository.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.elasticsearch.repositories;
+package org.springframework.data.elasticsearch.repositories.sample;
 
 import org.springframework.data.elasticsearch.SampleEntity;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
diff --git a/src/test/java/org/springframework/data/elasticsearch/repository/support/DoubleIDRepositoryTests.java b/src/test/java/org/springframework/data/elasticsearch/repository/support/DoubleIDRepositoryTests.java
index 719cdca4e..65632a6ef 100644
--- a/src/test/java/org/springframework/data/elasticsearch/repository/support/DoubleIDRepositoryTests.java
+++ b/src/test/java/org/springframework/data/elasticsearch/repository/support/DoubleIDRepositoryTests.java
@@ -27,7 +27,7 @@ import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.elasticsearch.DoubleIDEntity;
 import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
-import org.springframework.data.elasticsearch.repositories.DoubleIDRepository;
+import org.springframework.data.elasticsearch.repositories.doubleid.DoubleIDRepository;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -37,7 +37,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  */
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("classpath:/simple-repository-test.xml")
+@ContextConfiguration("classpath:/double-id-repository-test.xml")
 public class DoubleIDRepositoryTests {
 
 	@Autowired
diff --git a/src/test/java/org/springframework/data/elasticsearch/repository/support/IntegerIDRepositoryTests.java b/src/test/java/org/springframework/data/elasticsearch/repository/support/IntegerIDRepositoryTests.java
index 294deddbb..1bcced1de 100644
--- a/src/test/java/org/springframework/data/elasticsearch/repository/support/IntegerIDRepositoryTests.java
+++ b/src/test/java/org/springframework/data/elasticsearch/repository/support/IntegerIDRepositoryTests.java
@@ -27,7 +27,7 @@ import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.elasticsearch.IntegerIDEntity;
 import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
-import org.springframework.data.elasticsearch.repositories.IntegerIDRepository;
+import org.springframework.data.elasticsearch.repositories.integer.IntegerIDRepository;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -37,7 +37,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  */
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("classpath:/simple-repository-test.xml")
+@ContextConfiguration("classpath:/integer-id-repository-test.xml")
 public class IntegerIDRepositoryTests {
 
 	@Autowired
diff --git a/src/test/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepositoryTests.java b/src/test/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepositoryTests.java
index c1ecfdc73..1b864cb9f 100644
--- a/src/test/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepositoryTests.java
+++ b/src/test/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepositoryTests.java
@@ -36,7 +36,7 @@ import org.springframework.data.elasticsearch.SampleEntity;
 import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
 import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
 import org.springframework.data.elasticsearch.core.query.SearchQuery;
-import org.springframework.data.elasticsearch.repositories.SampleElasticsearchRepository;
+import org.springframework.data.elasticsearch.repositories.sample.SampleElasticsearchRepository;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
diff --git a/src/test/resources/custom-method-repository-test.xml b/src/test/resources/custom-method-repository-test.xml
index 87f82d868..5b54cdb02 100644
--- a/src/test/resources/custom-method-repository-test.xml
+++ b/src/test/resources/custom-method-repository-test.xml
@@ -14,7 +14,6 @@
 
 
     <elasticsearch:repositories
-            base-package="org.springframework.data.elasticsearch.repositories"/>
-
+            base-package="org.springframework.data.elasticsearch.repositories.custom"/>
 
 </beans>
\ No newline at end of file
diff --git a/src/test/resources/double-id-repository-test.xml b/src/test/resources/double-id-repository-test.xml
new file mode 100644
index 000000000..d855a5241
--- /dev/null
+++ b/src/test/resources/double-id-repository-test.xml
@@ -0,0 +1,19 @@
+<?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:elasticsearch="http://www.springframework.org/schema/data/elasticsearch"
+       xsi:schemaLocation="http://www.springframework.org/schema/data/elasticsearch http://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch-1.0.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+
+    <import resource="infrastructure.xml"/>
+
+    <bean name="elasticsearchTemplate"
+          class="org.springframework.data.elasticsearch.core.ElasticsearchTemplate">
+        <constructor-arg name="client" ref="client"/>
+    </bean>
+
+
+    <elasticsearch:repositories
+            base-package="org.springframework.data.elasticsearch.repositories.doubleid"/>
+
+</beans>
\ No newline at end of file
diff --git a/src/test/resources/integer-id-repository-test.xml b/src/test/resources/integer-id-repository-test.xml
new file mode 100644
index 000000000..792693c22
--- /dev/null
+++ b/src/test/resources/integer-id-repository-test.xml
@@ -0,0 +1,19 @@
+<?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:elasticsearch="http://www.springframework.org/schema/data/elasticsearch"
+       xsi:schemaLocation="http://www.springframework.org/schema/data/elasticsearch http://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch-1.0.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+
+    <import resource="infrastructure.xml"/>
+
+    <bean name="elasticsearchTemplate"
+          class="org.springframework.data.elasticsearch.core.ElasticsearchTemplate">
+        <constructor-arg name="client" ref="client"/>
+    </bean>
+
+
+    <elasticsearch:repositories
+            base-package="org.springframework.data.elasticsearch.repositories.integer"/>
+
+</beans>
\ No newline at end of file
diff --git a/src/test/resources/org/springframework/data/elasticsearch/config/namespace.xml b/src/test/resources/org/springframework/data/elasticsearch/config/namespace.xml
index 3af90c844..8a8b7726a 100644
--- a/src/test/resources/org/springframework/data/elasticsearch/config/namespace.xml
+++ b/src/test/resources/org/springframework/data/elasticsearch/config/namespace.xml
@@ -16,7 +16,6 @@
     <elasticsearch:transport-client id="transportClient"/>
 
     <elasticsearch:repositories
-            base-package="org.springframework.data.elasticsearch.repositories"/>
-
+            base-package="org.springframework.data.elasticsearch.repositories.sample"/>
 
 </beans>
\ No newline at end of file
diff --git a/src/test/resources/repository-non-document-entity.xml b/src/test/resources/repository-non-document-entity.xml
index af1135eff..1c540f6e3 100644
--- a/src/test/resources/repository-non-document-entity.xml
+++ b/src/test/resources/repository-non-document-entity.xml
@@ -12,6 +12,6 @@
         <constructor-arg name="client" ref="client"/>
     </bean>
 
-    <elasticsearch:repositories base-package="org.springframework.data.elasticsearch"/>
+    <elasticsearch:repositories base-package="org.springframework.data.elasticsearch.repositories.nondocument"/>
 
 </beans>
\ No newline at end of file
diff --git a/src/test/resources/simple-repository-test.xml b/src/test/resources/simple-repository-test.xml
index 87f82d868..907e2cc45 100644
--- a/src/test/resources/simple-repository-test.xml
+++ b/src/test/resources/simple-repository-test.xml
@@ -14,7 +14,6 @@
 
 
     <elasticsearch:repositories
-            base-package="org.springframework.data.elasticsearch.repositories"/>
-
+            base-package="org.springframework.data.elasticsearch.repositories.sample"/>
 
 </beans>
\ No newline at end of file