diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/ComplexCustomMethodRepositoryManualWiringTests.java b/src/test/java/org/springframework/data/elasticsearch/repository/complex/ComplexCustomMethodRepositoryManualWiringTests.java
similarity index 96%
rename from src/test/java/org/springframework/data/elasticsearch/repositories/ComplexCustomMethodRepositoryManualWiringTests.java
rename to src/test/java/org/springframework/data/elasticsearch/repository/complex/ComplexCustomMethodRepositoryManualWiringTests.java
index 77a310df6..72276bac7 100644
--- a/src/test/java/org/springframework/data/elasticsearch/repositories/ComplexCustomMethodRepositoryManualWiringTests.java
+++ b/src/test/java/org/springframework/data/elasticsearch/repository/complex/ComplexCustomMethodRepositoryManualWiringTests.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.repository.complex;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/ComplexCustomMethodRepositoryTests.java b/src/test/java/org/springframework/data/elasticsearch/repository/complex/ComplexCustomMethodRepositoryTests.java
similarity index 96%
rename from src/test/java/org/springframework/data/elasticsearch/repositories/ComplexCustomMethodRepositoryTests.java
rename to src/test/java/org/springframework/data/elasticsearch/repository/complex/ComplexCustomMethodRepositoryTests.java
index 4848de80c..d8167d034 100644
--- a/src/test/java/org/springframework/data/elasticsearch/repositories/ComplexCustomMethodRepositoryTests.java
+++ b/src/test/java/org/springframework/data/elasticsearch/repository/complex/ComplexCustomMethodRepositoryTests.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.repository.complex;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/ComplexElasticsearchRepository.java b/src/test/java/org/springframework/data/elasticsearch/repository/complex/ComplexElasticsearchRepository.java
similarity index 93%
rename from src/test/java/org/springframework/data/elasticsearch/repositories/ComplexElasticsearchRepository.java
rename to src/test/java/org/springframework/data/elasticsearch/repository/complex/ComplexElasticsearchRepository.java
index c23bc918d..406c5d31d 100644
--- a/src/test/java/org/springframework/data/elasticsearch/repositories/ComplexElasticsearchRepository.java
+++ b/src/test/java/org/springframework/data/elasticsearch/repository/complex/ComplexElasticsearchRepository.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.repository.complex;
 
 import org.springframework.data.elasticsearch.SampleEntity;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/ComplexElasticsearchRepositoryCustom.java b/src/test/java/org/springframework/data/elasticsearch/repository/complex/ComplexElasticsearchRepositoryCustom.java
similarity index 91%
rename from src/test/java/org/springframework/data/elasticsearch/repositories/ComplexElasticsearchRepositoryCustom.java
rename to src/test/java/org/springframework/data/elasticsearch/repository/complex/ComplexElasticsearchRepositoryCustom.java
index d8fe7572f..424b5f9d2 100644
--- a/src/test/java/org/springframework/data/elasticsearch/repositories/ComplexElasticsearchRepositoryCustom.java
+++ b/src/test/java/org/springframework/data/elasticsearch/repository/complex/ComplexElasticsearchRepositoryCustom.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.repository.complex;
 
 /**
  * @author Artur Konczak
diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/impl/ComplexElasticsearchRepositoryImpl.java b/src/test/java/org/springframework/data/elasticsearch/repository/complex/ComplexElasticsearchRepositoryImpl.java
similarity index 74%
rename from src/test/java/org/springframework/data/elasticsearch/repositories/impl/ComplexElasticsearchRepositoryImpl.java
rename to src/test/java/org/springframework/data/elasticsearch/repository/complex/ComplexElasticsearchRepositoryImpl.java
index c72c5693e..27a4bb94d 100644
--- a/src/test/java/org/springframework/data/elasticsearch/repositories/impl/ComplexElasticsearchRepositoryImpl.java
+++ b/src/test/java/org/springframework/data/elasticsearch/repository/complex/ComplexElasticsearchRepositoryImpl.java
@@ -1,8 +1,7 @@
-package org.springframework.data.elasticsearch.repositories.impl;
+package org.springframework.data.elasticsearch.repository.complex;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
-import org.springframework.data.elasticsearch.repositories.ComplexElasticsearchRepositoryCustom;
 
 /**
  * @author Artur Konczak
diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/ComplexElasticsearchRepositoryManualWiring.java b/src/test/java/org/springframework/data/elasticsearch/repository/complex/ComplexElasticsearchRepositoryManualWiring.java
similarity index 93%
rename from src/test/java/org/springframework/data/elasticsearch/repositories/ComplexElasticsearchRepositoryManualWiring.java
rename to src/test/java/org/springframework/data/elasticsearch/repository/complex/ComplexElasticsearchRepositoryManualWiring.java
index f4f854078..0b01982c3 100644
--- a/src/test/java/org/springframework/data/elasticsearch/repositories/ComplexElasticsearchRepositoryManualWiring.java
+++ b/src/test/java/org/springframework/data/elasticsearch/repository/complex/ComplexElasticsearchRepositoryManualWiring.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.repository.complex;
 
 import org.springframework.data.elasticsearch.SampleEntity;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/impl/ComplexElasticsearchRepositoryManualWiringImpl.java b/src/test/java/org/springframework/data/elasticsearch/repository/complex/ComplexElasticsearchRepositoryManualWiringImpl.java
similarity index 87%
rename from src/test/java/org/springframework/data/elasticsearch/repositories/impl/ComplexElasticsearchRepositoryManualWiringImpl.java
rename to src/test/java/org/springframework/data/elasticsearch/repository/complex/ComplexElasticsearchRepositoryManualWiringImpl.java
index 23f5f9bb7..9dd400893 100644
--- a/src/test/java/org/springframework/data/elasticsearch/repositories/impl/ComplexElasticsearchRepositoryManualWiringImpl.java
+++ b/src/test/java/org/springframework/data/elasticsearch/repository/complex/ComplexElasticsearchRepositoryManualWiringImpl.java
@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.elasticsearch.repositories.impl;
+package org.springframework.data.elasticsearch.repository.complex;
 
 import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
-import org.springframework.data.elasticsearch.repositories.ComplexElasticsearchRepositoryCustom;
 
 /**
  * @author Artur Konczak
diff --git a/src/test/resources/complex-custom-method-repository-manual-wiring-test.xml b/src/test/resources/complex-custom-method-repository-manual-wiring-test.xml
index 1262d4e2b..3eab6f43b 100644
--- a/src/test/resources/complex-custom-method-repository-manual-wiring-test.xml
+++ b/src/test/resources/complex-custom-method-repository-manual-wiring-test.xml
@@ -13,9 +13,9 @@
 	</bean>
 
 	<elasticsearch:repositories
-            base-package="org.springframework.data.elasticsearch.repositories" />
+            base-package="org.springframework.data.elasticsearch.repository.complex" />
 
-    <bean id="complexElasticsearchRepositoryManualWiringImpl" class="org.springframework.data.elasticsearch.repositories.impl.ComplexElasticsearchRepositoryManualWiringImpl">
+    <bean id="complexElasticsearchRepositoryManualWiringImpl" class="org.springframework.data.elasticsearch.repository.complex.ComplexElasticsearchRepositoryManualWiringImpl">
         <property name="template" ref="elasticsearchTemplate"/>
     </bean>
 
diff --git a/src/test/resources/complex-custom-method-repository-test.xml b/src/test/resources/complex-custom-method-repository-test.xml
index 316af0b9d..a382dd09a 100644
--- a/src/test/resources/complex-custom-method-repository-test.xml
+++ b/src/test/resources/complex-custom-method-repository-test.xml
@@ -13,6 +13,6 @@
 	</bean>
 
 	<elasticsearch:repositories
-		base-package="org.springframework.data.elasticsearch.repositories" />
+		base-package="org.springframework.data.elasticsearch.repository.complex" />
 
 </beans>
\ No newline at end of file