diff --git a/src/test/java/com/blackduck/integration/detect/battery/docker/PipTest.java b/src/test/java/com/blackduck/integration/detect/battery/docker/PipTest.java
index caa5d00e45..a2549b030f 100644
--- a/src/test/java/com/blackduck/integration/detect/battery/docker/PipTest.java
+++ b/src/test/java/com/blackduck/integration/detect/battery/docker/PipTest.java
@@ -42,7 +42,7 @@ private static Stream<String> providePipPkgResourcesVersionsToTest() {
     @ParameterizedTest
     @MethodSource("providePipVersionsToTest")
     public void pipExecutableTest(String pipVersion) throws IntegrationException, IOException {
-        try (DetectDockerTestRunner test = new DetectDockerTestRunner("pip-docker-test", "pip-docker-test:" + pipVersion)) {
+        try (DetectDockerTestRunner test = new DetectDockerTestRunner("pip-docker-test", "pip-docker-test:" + pipVersion + "-jdk11")) {
 
             Map<String, String> pipDockerfileArgs = new HashMap<>();
             pipDockerfileArgs.put("PIP_VERSION", pipVersion);
@@ -140,7 +140,7 @@ private void validateComponentsForSamplePipPkgProject(BlackDuckAssertions blackd
 
     @Test
     public void pythonHybridTest() throws IntegrationException, IOException {
-        try (DetectDockerTestRunner test = new DetectDockerTestRunner("python-hybrid-test", "python-hybrid-test:1.0.0" )) {
+        try (DetectDockerTestRunner test = new DetectDockerTestRunner("python-hybrid-test", "python-hybrid-test:1.0.1-jdk11")) {
 
             Map<String, String> dockerfileArgs = new HashMap<>();
             dockerfileArgs.put("ARTIFACTORY_URL", ARTIFACTORY_URL);
diff --git a/src/test/java/com/blackduck/integration/detect/battery/docker/PipenvTest.java b/src/test/java/com/blackduck/integration/detect/battery/docker/PipenvTest.java
index b1ce1a0bea..de0671076a 100644
--- a/src/test/java/com/blackduck/integration/detect/battery/docker/PipenvTest.java
+++ b/src/test/java/com/blackduck/integration/detect/battery/docker/PipenvTest.java
@@ -36,7 +36,7 @@ private static Stream<String> providePipenvVersionsToTest() {
     @ParameterizedTest
     @MethodSource("providePipenvVersionsToTest")
     public void pipenvExecutableTest(String pipenvVersion) throws IntegrationException, IOException {
-        try (DetectDockerTestRunner test = new DetectDockerTestRunner("pipenv-docker-test", "pipenv-docker-test:" + pipenvVersion)) {
+        try (DetectDockerTestRunner test = new DetectDockerTestRunner("pipenv-docker-test", "pipenv-docker-test:" + pipenvVersion + "-jdk11")) {
 
             Map<String, String> pipenvDockerfileArgs = new HashMap<>();
             pipenvDockerfileArgs.put("PIPENV_VERSION_VAL", pipenvVersion);
diff --git a/src/test/java/com/blackduck/integration/detect/battery/docker/SetuptoolsTest.java b/src/test/java/com/blackduck/integration/detect/battery/docker/SetuptoolsTest.java
index cfdd8adf29..646ba5d164 100644
--- a/src/test/java/com/blackduck/integration/detect/battery/docker/SetuptoolsTest.java
+++ b/src/test/java/com/blackduck/integration/detect/battery/docker/SetuptoolsTest.java
@@ -36,7 +36,7 @@ private static Stream<String> provideSetuptoolsVersionsToTest() {
     @ParameterizedTest
     @MethodSource("provideSetuptoolsVersionsToTest")
     public void setuptoolsExecutableTest(String setuptoolsVersion) throws IntegrationException, IOException {
-        try (DetectDockerTestRunner test = new DetectDockerTestRunner("setuptools-docker-test   ", "setuptools-docker-test:" + setuptoolsVersion)) {
+        try (DetectDockerTestRunner test = new DetectDockerTestRunner("setuptools-docker-test", "setuptools-docker-test:" + setuptoolsVersion + "-jdk11v2")) {
 
             Map<String, String> setuptoolsDockerfileArgs = new HashMap<>();
             setuptoolsDockerfileArgs.put("ARTIFACTORY_URL", ARTIFACTORY_URL);
diff --git a/src/test/resources/docker/Setuptools.dockerfile b/src/test/resources/docker/Setuptools.dockerfile
index fb65ca72d5..10bf604f94 100644
--- a/src/test/resources/docker/Setuptools.dockerfile
+++ b/src/test/resources/docker/Setuptools.dockerfile
@@ -24,4 +24,4 @@ RUN wget ${ARTIFACTORY_URL}/artifactory/detect-generic-qa-local/setuptools-test-
 RUN unzip setuptools-test-project.zip -d /opt/project/src
 RUN mv setuptools-test-project/* .
 RUN rm -r setuptools-test-project setuptools-test-project.zip
-RUN /bin/sh -c "pip install ."
\ No newline at end of file
+RUN /bin/sh -c "pip install ."