diff --git a/Dockerfile.openj9 b/Dockerfile.openj9
index 9475631..af59b45 100644
--- a/Dockerfile.openj9
+++ b/Dockerfile.openj9
@@ -35,6 +35,7 @@ RUN bash get_source.sh
 
 RUN bash configure --with-jtreg=/build/jtreg --with-boot-jdk=/build/bootjdk --with-openssl=system --with-extra-ldflags="-Wl,-z,noexecstack"
 RUN make all JOBS=$(nproc)
+RUN make test TEST=tier2 JOBS=$(nproc)
 
 # jlink by advice from https://adoptium.net/blog/2021/10/jlink-to-produce-own-runtime/
 WORKDIR /build/src/build/linux-x86_64-server-release/images
@@ -51,14 +52,6 @@ openj9.sharedclasses,openj9.zosconditionhandling
 
 RUN mv ./* /build/dist/
 
-ENV JAVA_HOME=/build/dist/jre
-ENV PATH="$JAVA_HOME/bin:$PATH"
-
-WORKDIR /build/src
-RUN make test TEST=tier1 JOBS=$(nproc)
-
-
-
 
 # ------