diff --git a/dev-tools/idea/.idea/ant.xml b/dev-tools/idea/.idea/ant.xml
index b585698234c..0a924a7d0ad 100644
--- a/dev-tools/idea/.idea/ant.xml
+++ b/dev-tools/idea/.idea/ant.xml
@@ -21,6 +21,7 @@
     <buildFile url="file://$PROJECT_DIR$/modules/benchmark/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/modules/facet/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/modules/grouping/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/modules/join/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/modules/suggest/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/solr/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/solr/contrib/analysis-extras/build.xml" />
diff --git a/dev-tools/idea/.idea/modules.xml b/dev-tools/idea/.idea/modules.xml
index 83bec35667d..1334902e60e 100644
--- a/dev-tools/idea/.idea/modules.xml
+++ b/dev-tools/idea/.idea/modules.xml
@@ -23,6 +23,7 @@
       <module filepath="$PROJECT_DIR$/modules/common/common.iml" />
       <module filepath="$PROJECT_DIR$/modules/facet/facet.iml" />
       <module filepath="$PROJECT_DIR$/modules/grouping/grouping.iml" />
+      <module filepath="$PROJECT_DIR$/modules/join/join.iml" />
       <module filepath="$PROJECT_DIR$/modules/queries/queries.iml" />
       <module filepath="$PROJECT_DIR$/modules/suggest/suggest.iml" />
       <module filepath="$PROJECT_DIR$/solr/solr.iml" />
diff --git a/dev-tools/idea/.idea/workspace.xml b/dev-tools/idea/.idea/workspace.xml
index 556b12b9e85..27e8630defc 100644
--- a/dev-tools/idea/.idea/workspace.xml
+++ b/dev-tools/idea/.idea/workspace.xml
@@ -92,6 +92,13 @@
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
+    <configuration default="false" name="join module" type="JUnit" factoryName="JUnit">
+      <module name="join" />
+      <option name="TEST_OBJECT" value="package" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/join/build" />
+      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
+      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+    </configuration>
     <configuration default="false" name="lucene" type="JUnit" factoryName="JUnit">
       <module name="lucene" />
       <option name="TEST_OBJECT" value="package" />
@@ -197,7 +204,7 @@
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
-    <list size="28">
+    <list size="29">
       <item index="0" class="java.lang.String" itemvalue="JUnit.analysis-extras contrib" />
       <item index="1" class="java.lang.String" itemvalue="JUnit.benchmark module" />
       <item index="2" class="java.lang.String" itemvalue="JUnit.clustering contrib" />
@@ -211,21 +218,22 @@
       <item index="10" class="java.lang.String" itemvalue="JUnit.highlighter contrib" />
       <item index="11" class="java.lang.String" itemvalue="JUnit.icu analysis module" />
       <item index="12" class="java.lang.String" itemvalue="JUnit.instantiated contrib" />
-      <item index="13" class="java.lang.String" itemvalue="JUnit.lucene" />
-      <item index="14" class="java.lang.String" itemvalue="JUnit.memory contrib" />
-      <item index="15" class="java.lang.String" itemvalue="JUnit.misc contrib" />
-      <item index="16" class="java.lang.String" itemvalue="JUnit.phonetic analysis module" />
-      <item index="17" class="java.lang.String" itemvalue="JUnit.queries contrib" />
-      <item index="18" class="java.lang.String" itemvalue="JUnit.queries module" />
-      <item index="19" class="java.lang.String" itemvalue="JUnit.queryparser contrib" />
-      <item index="20" class="java.lang.String" itemvalue="JUnit.smartcn analysis module" />
-      <item index="21" class="java.lang.String" itemvalue="JUnit.solr" />
-      <item index="22" class="java.lang.String" itemvalue="JUnit.spatial contrib" />
-      <item index="23" class="java.lang.String" itemvalue="JUnit.stempel analysis module" />
-      <item index="24" class="java.lang.String" itemvalue="JUnit.suggest module" />
-      <item index="25" class="java.lang.String" itemvalue="JUnit.uima contrib" />
-      <item index="26" class="java.lang.String" itemvalue="JUnit.wordnet contrib" />
-      <item index="27" class="java.lang.String" itemvalue="JUnit.xml-query-parser contrib" />
+      <item index="13" class="java.lang.String" itemvalue="JUnit.join module" />
+      <item index="14" class="java.lang.String" itemvalue="JUnit.lucene" />
+      <item index="15" class="java.lang.String" itemvalue="JUnit.memory contrib" />
+      <item index="16" class="java.lang.String" itemvalue="JUnit.misc contrib" />
+      <item index="17" class="java.lang.String" itemvalue="JUnit.phonetic analysis module" />
+      <item index="18" class="java.lang.String" itemvalue="JUnit.queries contrib" />
+      <item index="19" class="java.lang.String" itemvalue="JUnit.queries module" />
+      <item index="20" class="java.lang.String" itemvalue="JUnit.queryparser contrib" />
+      <item index="21" class="java.lang.String" itemvalue="JUnit.smartcn analysis module" />
+      <item index="22" class="java.lang.String" itemvalue="JUnit.solr" />
+      <item index="23" class="java.lang.String" itemvalue="JUnit.spatial contrib" />
+      <item index="24" class="java.lang.String" itemvalue="JUnit.stempel analysis module" />
+      <item index="25" class="java.lang.String" itemvalue="JUnit.suggest module" />
+      <item index="26" class="java.lang.String" itemvalue="JUnit.uima contrib" />
+      <item index="27" class="java.lang.String" itemvalue="JUnit.wordnet contrib" />
+      <item index="28" class="java.lang.String" itemvalue="JUnit.xml-query-parser contrib" />
     </list>
   </component>
 </project>
diff --git a/dev-tools/idea/modules/join/join.iml b/dev-tools/idea/modules/join/join.iml
index 50cb2814087..f6138c55f87 100644
--- a/dev-tools/idea/modules/join/join.iml
+++ b/dev-tools/idea/modules/join/join.iml
@@ -12,6 +12,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+    <orderEntry type="module" module-name="grouping" />
     <orderEntry type="module" module-name="lucene" />
   </component>
 </module>