diff --git a/tests/features/java/runtime.feature b/modules/jvm/tests/features/runtime.feature
similarity index 79%
rename from tests/features/java/runtime.feature
rename to modules/jvm/tests/features/runtime.feature
index 10477a62..4104541a 100644
--- a/tests/features/java/runtime.feature
+++ b/modules/jvm/tests/features/runtime.feature
@@ -3,16 +3,6 @@
 @ubi9/openjdk-21
 Feature: Openshift OpenJDK Runtime tests
 
-  Scenario: Ensure JAVA_ARGS is passed through, diagnostic options work correctly, JVM_ARGS not present in run script, OPENJDK-474 JAVA_ARGS not repeated
-    Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
-       | variable         | value  |
-       | JAVA_ARGS        | unique |
-       | JAVA_DIAGNOSTICS | true   |
-    Then container log should contain /deployments/undertow-servlet.jar unique
-     And container log should contain -XX:NativeMemoryTracking=summary
-     And file /usr/local/s2i/run should not contain JVM_ARGS
-     And container log should not contain unique unique
-
   @ubi9
   Scenario: Check JAVA_OPTS overrides defaults
     Given container is started with env
diff --git a/modules/run/tests/features/java.runtime.feature b/modules/run/tests/features/java.runtime.feature
new file mode 100644
index 00000000..bfb54ea1
--- /dev/null
+++ b/modules/run/tests/features/java.runtime.feature
@@ -0,0 +1,14 @@
+@ubi9/openjdk-11
+@ubi9/openjdk-17
+@ubi9/openjdk-21
+Feature: Openshift OpenJDK Runtime tests (OPENJDK-474)
+
+  Scenario: Ensure JAVA_ARGS is passed through, diagnostic options work correctly, JVM_ARGS not present in run script, OPENJDK-474 JAVA_ARGS not repeated
+    Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
+       | variable         | value  |
+       | JAVA_ARGS        | unique |
+       | JAVA_DIAGNOSTICS | true   |
+    Then container log should contain /deployments/undertow-servlet.jar unique
+     And container log should contain -XX:NativeMemoryTracking=summary
+     And file /usr/local/s2i/run should not contain JVM_ARGS
+     And container log should not contain unique unique