diff --git a/tests/features/java/openjdk_s2i.feature b/modules/s2i/core/api/tests/features/java_s2i_quarkus.feature
similarity index 76%
rename from tests/features/java/openjdk_s2i.feature
rename to modules/s2i/core/api/tests/features/java_s2i_quarkus.feature
index 88dd4123..0d72808f 100644
--- a/tests/features/java/openjdk_s2i.feature
+++ b/modules/s2i/core/api/tests/features/java_s2i_quarkus.feature
@@ -2,16 +2,7 @@
 @ubi8/openjdk-11
 @ubi8/openjdk-17
 @ubi8/openjdk-21
-Feature: Openshift OpenJDK-only S2I tests
-
-  @ubi8/openjdk-8
-  # temporarily marking 'ignore' so these tests are skipped on GHA
-  # See: https://issues.redhat.com/browse/OPENJDK-2602
-  @ignore
-  Scenario: Check java perf dir owned by jboss (CLOUD-2070)
-    Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
-    Then run jstat -gc 1 1000 1 in container and check its output for S0C
-    And run stat --printf="%U %G" /tmp/hsperfdata_jboss/ in container and check its output for jboss root
+Feature: Openshift OpenJDK S2I tests (Quarkus-based)
 
   Scenario: Ensure Quarkus CDS doesn't fail due to timestamp mismatch (OPENDJK-1673)
     Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from getting-started