Index: /trunk/nodist/pom.xml
===================================================================
--- /trunk/nodist/pom.xml	(revision 19682)
+++ /trunk/nodist/pom.xml	(revision 19683)
@@ -62,4 +62,9 @@
                     <artifactId>maven-clean-plugin</artifactId>
                     <version>3.4.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>build-helper-maven-plugin</artifactId>
+                    <version>3.6.1</version>
                 </plugin>
                 <plugin>
Index: /trunk/pom.xml
===================================================================
--- /trunk/pom.xml	(revision 19682)
+++ /trunk/pom.xml	(revision 19683)
@@ -493,4 +493,26 @@
               <goal>check</goal>
             </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- Register test/functional and test/performance as test sources for IDEs (IntelliJ, Eclipse m2e).
+           Bound after test-compile so default-testCompile does not build them into the unit test classes;
+           maven-compiler-plugin below compiles them separately. -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>add-functional-performance-test-sources</id>
+            <phase>process-test-classes</phase>
+            <goals>
+              <goal>add-test-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${test.dir}/functional</source>
+                <source>${test.dir}/performance</source>
+              </sources>
+            </configuration>
           </execution>
         </executions>
