diff --git a/source/test-java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryTest.java b/source/test-java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryTest.java
index 4077bc7fec..e9b42e3305 100644
--- a/source/test-java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryTest.java
+++ b/source/test-java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryTest.java
@@ -247,7 +247,7 @@ public class DBQueryTest  implements DictionaryListener
     protected void loadTestModel()
     {
         ClassLoader cl = BaseNodeServiceTest.class.getClassLoader();
-        InputStream modelStream = cl.getResourceAsStream("org/alfresco/repo/search/impl/querymodel/impl/db/MetadataQueryTest_model.xml");
+        InputStream modelStream = cl.getResourceAsStream("org/alfresco/repo/search/impl/MetadataQueryTest_model.xml");
         assertNotNull(modelStream);
         model = M2Model.createModel(modelStream);
         dictionaryDAO.register(this);
diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/MetadataQueryTest_model.xml b/source/test-resources/org/alfresco/repo/search/impl/MetadataQueryTest_model.xml
similarity index 100%
rename from source/java/org/alfresco/repo/search/impl/querymodel/impl/db/MetadataQueryTest_model.xml
rename to source/test-resources/org/alfresco/repo/search/impl/MetadataQueryTest_model.xml