diff --git a/modules/jolokia/8.2/tests/features/jolokia.feature b/modules/jolokia/8.2/tests/features/jolokia.feature
index 79802646..076f8c66 100644
--- a/modules/jolokia/8.2/tests/features/jolokia.feature
+++ b/modules/jolokia/8.2/tests/features/jolokia.feature
@@ -1,12 +1,12 @@
+@ubi8/openjdk-8
+@ubi8/openjdk-11
 # Tests for jboss/container/jolokia
 Feature: Openshift OpenJDK Jolokia tests
 
-  Scenario: Check Environment variable is correct
-    Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
-    Then run sh -c 'unzip -q -p /usr/share/java/jolokia-jvm-agent/jolokia-jvm.jar META-INF/maven/org.jolokia/jolokia-jvm/pom.properties | grep -F ${JOLOKIA_VERSION}' in container and check its output for version=
+  Scenario: Ensure JOLOKIA_VERSION variable aligns with JAR
+    When container is started with command sh
+    Then run sh -c 'jar xf /usr/share/java/jolokia-jvm-agent/jolokia-jvm.jar META-INF/maven/org.jolokia/jolokia-jvm/pom.properties && grep ${JOLOKIA_VERSION} META-INF/maven/org.jolokia/jolokia-jvm/pom.properties' in container and check its output for version=
 
-  @ubi8/openjdk-8
-  @ubi8/openjdk-11
   Scenario: Check jolokia port is available
     Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
     Then check that port 8778 is open
@@ -14,8 +14,6 @@ Feature: Openshift OpenJDK Jolokia tests
        | path                    | value       |
        | /Config/ExposedPorts    | 8778/tcp    |
 
-  @ubi8/openjdk-8
-  @ubi8/openjdk-11
   Scenario: Ensure Jolokia diagnostic options work correctly
     Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
        | variable         | value               |