diff --git a/dist/testng-integration.xml b/dist/testng-integration.xml
deleted file mode 100644
index 86d7187deb6..00000000000
--- a/dist/testng-integration.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2015 Evolveum and contributors
-  ~
-  ~ This work is dual-licensed under the Apache License 2.0
-  ~ and European Union Public License. See LICENSE file for details.
-  -->
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="integration" parallel="false" verbose="1">
-</suite>
diff --git a/dist/testng-unit.xml b/dist/testng-unit.xml
deleted file mode 100644
index 136f8aa1e9b..00000000000
--- a/dist/testng-unit.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2015 Evolveum and contributors
-  ~
-  ~ This work is dual-licensed under the Apache License 2.0
-  ~ and European Union Public License. See LICENSE file for details.
-  -->
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="unit" parallel="false" verbose="1">
-</suite>
diff --git a/pom.xml b/pom.xml
index 4b0a8ebcaf4..1269a50ba50 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,25 +23,34 @@
     - Test JARs of some modules are created, installed/deployed and used downstream (search for test-jar).
 
     VARIOUS MVN COMMANDS (with rough times on average notebook)
+    Note: Javadoc takes long time but it's only part of the "dist" profile (active by default).
+    Hence, " -Dmaven.javadoc.skip" is not necessary with "-P -dist".
 
-    Quick run without any tests (~6m):
-    mvn clean install -P -dist -DskipTests -Dmaven.javadoc.skip -Dcheckstyle.skip
+    Quick developer's run without any tests, skipping distribution (~6m):
+    mvn clean install -P -dist -DskipTests -Dcheckstyle.skip
 
     "Quick" build with unit tests only and checkstyle (~30m):
-    mvn clean install -P -dist -DskipITs -Dmaven.javadoc.skip
+    mvn clean install -P -dist -DskipITs
 
-    "Quick" build with smaller integration test (~1h20m):
-    mvn clean install -P -dist -DintegrationTestSuite=fast -Dmaven.javadoc.skip
+    "Quick" build with smaller/faster set of integration test (~1h20m):
+    mvn clean install -P -dist -DintegrationTestSuite=fast
 
-    Running tests of a selected module (-pl) with output to stdout (don't use stdout for complete build, it's too much):
-    mvn clean install -DredirectTestOutputToFile=false -pl model/model-intest
+    Default build - creates distribution package, runs all tests except "extra" tests ():
+    mvn clean install
+
+    Extra test run with custom JVM args (we have 16g on CI server, but it works without args too),
+    runs just under 900 tests, skips distribution and any common unit/IT tests (~1h50m):
+    mvn clean install -P extratest,-dist -Dsurefire.args="-Xmx8g" -Dfailsafe.args="-Xmx8g -Duser.language=en"
+
+    Extra test run for a single module, -D property matches the module in -pl:
+    mvn clean install -DskipConnTests=false -pl testing/conntest
 
-    Long test run (with 16g on CI server, but this should work too - isn't Xmx even unnecessary?),
-    runs just under 900 tests (~1h50m):
-    mvn -P tomcat,extratest clean install -Dsurefire.args="-Xmx8g" -Dfailsafe.args="-Xmx8g -Duser.language=en"
+    Full build with extra tests for a single module, "-DskipTests" suppresses other default tests:
+    mvn clean install -P -dist -DskipTests -DskipStoryTests=false
+    See "extratest" profile in testing/pom.xml for all individual properties enabling extra tests.
 
-    Comprehensive quick build/dist with normally excluded modules including checkstyle, but no tests/javadoc (~13m):
-    mvn clean install -P dist,extratest,conntest,schrodinger -DskipTests -Dmaven.javadoc.skip
+    Running unit+IT tests of a selected module (-pl) with output to stdout:
+    mvn clean install -DredirectTestOutputToFile=false -pl model/model-intest
     -->
 
     <groupId>com.evolveum.midpoint</groupId>
@@ -2030,6 +2039,18 @@
             </modules>
         </profile>
 
+        <!--
+        Activating extra tests (tests under testing module), skipping other tests.
+        Often we want to combine with disabling dist: -P extratest,-dist
+        See testing/pom.xml for more on "extra" tests, here we just skip the default tests.
+        -->
+        <profile>
+            <id>extratest</id>
+            <properties>
+                <skipTests>true</skipTests>
+            </properties>
+        </profile>
+
         <profile>
             <id>jdk-11</id>
             <properties>
diff --git a/testing/conntest/pom.xml b/testing/conntest/pom.xml
index f4055defe2d..e4f976f748f 100644
--- a/testing/conntest/pom.xml
+++ b/testing/conntest/pom.xml
@@ -19,11 +19,6 @@
 
     <name>midPoint Testing - Resource Connection Tests</name>
 
-    <properties>
-        <!-- See comment in testing parent module. -->
-        <skipConnTests>true</skipConnTests>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>com.evolveum.midpoint.infra</groupId>
diff --git a/testing/longtest/pom.xml b/testing/longtest/pom.xml
index b8b3fdd882a..a3923502416 100644
--- a/testing/longtest/pom.xml
+++ b/testing/longtest/pom.xml
@@ -19,11 +19,6 @@
 
     <name>midPoint Testing - Long Tests</name>
 
-    <properties>
-        <!-- See comment in testing parent module. -->
-        <skipLongTests>true</skipLongTests>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>com.evolveum.midpoint.infra</groupId>
diff --git a/testing/pom.xml b/testing/pom.xml
index 20944cf37cd..69a13030fc0 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -44,5 +44,29 @@
         <!-- This applies to all testing submodules, all of them have only src/test, not main. -->
         <maven.install.skip>true</maven.install.skip>
         <maven.deploy.skip>true</maven.deploy.skip>
+
+        <!-- Properties controlling "extra" test modules. See "extratest" profile lower. -->
+        <skipConnTests>true</skipConnTests>
+        <skipLongTests>true</skipLongTests>
+        <skipRestTests>true</skipRestTests>
+        <skipSamplesTests>true</skipSamplesTests>
+        <skipStoryTests>true</skipStoryTests>
+        <!-- By default we skip Schrodinger tests. This is not part of "extra" tests. -->
+        <skipSchrodingerTests>true</skipSchrodingerTests>
     </properties>
+
+    <profiles>
+        <profile>
+            <id>extratest</id>
+            <properties>
+                <skipTests>true</skipTests>
+                <skipConnTests>false</skipConnTests>
+                <skipLongTests>false</skipLongTests>
+                <skipRestTests>false</skipRestTests>
+                <skipSamplesTests>false</skipSamplesTests>
+                <skipStoryTests>false</skipStoryTests>
+                <!-- Schrodinger tests are separate, we don't want them in this profile -->
+            </properties>
+        </profile>
+    </profiles>
 </project>
diff --git a/testing/rest/pom.xml b/testing/rest/pom.xml
index 57402cdcf02..1e9fafbb2ad 100644
--- a/testing/rest/pom.xml
+++ b/testing/rest/pom.xml
@@ -19,11 +19,6 @@
 
     <name>midPoint Testing - REST API</name>
 
-    <properties>
-        <!-- See comment in testing parent module. -->
-        <skipRestTests>true</skipRestTests>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>com.evolveum.midpoint.infra</groupId>
diff --git a/testing/samples-test/pom.xml b/testing/samples-test/pom.xml
index 45cb5c5df56..e651532ab41 100644
--- a/testing/samples-test/pom.xml
+++ b/testing/samples-test/pom.xml
@@ -19,11 +19,6 @@
 
     <name>midPoint Samples - Test</name>
 
-    <properties>
-        <!-- See comment in testing parent module. -->
-        <skipSamplesTests>true</skipSamplesTests>
-    </properties>
-
     <dependencies>
         <!-- TEST dependency -->
         <dependency>
diff --git a/testing/schrodingertest/pom.xml b/testing/schrodingertest/pom.xml
index 46185745a09..a7829281c29 100644
--- a/testing/schrodingertest/pom.xml
+++ b/testing/schrodingertest/pom.xml
@@ -28,8 +28,6 @@
         -->
         <project.starter.module>../../gui/admin-gui</project.starter.module>
         <project.app.package.name>com.evolveum.midpoint.web.boot.MidPointSpringApplication</project.app.package.name>
-        <!-- See comment in testing parent module. -->
-        <skipSchrodingerTests>true</skipSchrodingerTests>
         <server.port>8180</server.port>
         <midpoint.host>0.0.0.0</midpoint.host>
         <midpoint.home></midpoint.home>