diff --git a/tests/features/java/gc.feature b/modules/jvm/api/tests/features/gc.feature
similarity index 98%
rename from tests/features/java/gc.feature
rename to modules/jvm/api/tests/features/gc.feature
index 484c79e3..38b123da 100644
--- a/tests/features/java/gc.feature
+++ b/modules/jvm/api/tests/features/gc.feature
@@ -1,7 +1,4 @@
-
-@ubi8/openjdk-8
-@ubi8/openjdk-11
-@ubi8/openjdk-17
+@ubi8
 Feature: Openshift OpenJDK GC tests
 
   Scenario: Check default GC configuration
diff --git a/tests/features/java/memory.feature b/modules/jvm/api/tests/features/memory.feature
similarity index 100%
rename from tests/features/java/memory.feature
rename to modules/jvm/api/tests/features/memory.feature
diff --git a/tests/features/java/java_s2i.feature b/modules/maven/s2i/tests/features/java_s2i.feature
similarity index 100%
rename from tests/features/java/java_s2i.feature
rename to modules/maven/s2i/tests/features/java_s2i.feature
diff --git a/tests/features/java/java_s2i_inc.feature b/modules/maven/s2i/tests/features/java_s2i_inc.feature
similarity index 100%
rename from tests/features/java/java_s2i_inc.feature
rename to modules/maven/s2i/tests/features/java_s2i_inc.feature
diff --git a/tests/features/java/java_s2i_quarkus.feature b/modules/maven/s2i/tests/features/java_s2i_quarkus.feature
similarity index 100%
rename from tests/features/java/java_s2i_quarkus.feature
rename to modules/maven/s2i/tests/features/java_s2i_quarkus.feature
diff --git a/tests/features/java.security.feature b/modules/run/tests/features/java.security.feature
similarity index 100%
rename from tests/features/java.security.feature
rename to modules/run/tests/features/java.security.feature
diff --git a/tests/features/s2i-core.feature b/modules/s2i/core/api/tests/features/s2i-core.feature
similarity index 100%
rename from tests/features/s2i-core.feature
rename to modules/s2i/core/api/tests/features/s2i-core.feature
diff --git a/tests/features/general.feature b/modules/user/tests/features/general.feature
similarity index 100%
rename from tests/features/general.feature
rename to modules/user/tests/features/general.feature