diff --git a/src/test/java/org/elasticsearch/index/query/plugin/CustomQueryParserTests.java b/core/src/test/java/org/elasticsearch/index/query/plugin/CustomQueryParserTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/plugin/CustomQueryParserTests.java
rename to core/src/test/java/org/elasticsearch/index/query/plugin/CustomQueryParserTests.java
diff --git a/src/test/java/org/elasticsearch/index/query/plugin/DummyQueryParserPlugin.java b/core/src/test/java/org/elasticsearch/index/query/plugin/DummyQueryParserPlugin.java
similarity index 97%
rename from src/test/java/org/elasticsearch/index/query/plugin/DummyQueryParserPlugin.java
rename to core/src/test/java/org/elasticsearch/index/query/plugin/DummyQueryParserPlugin.java
index b25668a06c8..2e0356e4619 100644
--- a/src/test/java/org/elasticsearch/index/query/plugin/DummyQueryParserPlugin.java
+++ b/core/src/test/java/org/elasticsearch/index/query/plugin/DummyQueryParserPlugin.java
@@ -52,7 +52,7 @@ public class DummyQueryParserPlugin extends AbstractPlugin {
     public void processModule(Module module) {
         if (module instanceof IndicesQueriesModule) {
             IndicesQueriesModule indicesQueriesModule = (IndicesQueriesModule) module;
-            indicesQueriesModule.addQuery(DummyQueryParserPlugin.DummyQueryParser.class);
+            indicesQueriesModule.addQuery(DummyQueryParser.class);
         }
     }