diff --git a/powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/testutils/Infrastructure.java b/powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/testutils/Infrastructure.java
index 28a0f2bb4..b7d3354e1 100644
--- a/powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/testutils/Infrastructure.java
+++ b/powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/testutils/Infrastructure.java
@@ -513,7 +513,7 @@ private Builder() {
 
         private JavaRuntime mapRuntimeVersion(String environmentVariableName) {
             String javaVersion = System.getenv(environmentVariableName); // must be set in GitHub actions
-            JavaRuntime ret = null;
+            JavaRuntime ret;
             if (javaVersion == null) {
                 throw new IllegalArgumentException(environmentVariableName + " is not set");
             }
diff --git a/powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/testutils/JavaRuntime.java b/powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/testutils/JavaRuntime.java
index c75682949..9f04831c0 100644
--- a/powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/testutils/JavaRuntime.java
+++ b/powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/testutils/JavaRuntime.java
@@ -17,7 +17,6 @@
 import software.amazon.awscdk.services.lambda.Runtime;
 
 public enum JavaRuntime {
-    JAVA8("java8", Runtime.JAVA_8, "1.8"),
     JAVA8AL2("java8.al2", Runtime.JAVA_8_CORRETTO, "1.8"),
     JAVA11("java11", Runtime.JAVA_11, "11"),
     JAVA17("java17", Runtime.JAVA_17, "17"),