diff --git a/Dockerfile.openj9 b/Dockerfile.openj9
index d16887d..3fb2aa7 100644
--- a/Dockerfile.openj9
+++ b/Dockerfile.openj9
@@ -2,13 +2,13 @@ FROM ubuntu:25.04 AS build
 
 # partly copied from mkdocker.sh
 # Copyright IBM Corp (Eclipse Public License 2.0)
-RUN apt update \
- && apt upgrade -y \
- && apt install -qq -y --no-install-recommends \
+RUN apt -qq update \
+ && apt -qq upgrade -y \
+ && apt -qq install -y --no-install-recommends \
       ant ant-contrib autoconf build-essential ca-certificates cmake cpio curl file gcc-14 g++-14 gdb git \
       libasound2-dev libcups2-dev libdwarf-dev libelf-dev libexpat1-dev libffi-dev libfontconfig libfontconfig1-dev \
       libfreetype6-dev libnuma-dev libssl-dev libx11-dev libxext-dev libxrandr-dev libxrender-dev libxt-dev libxtst-dev \
-      make nasm pkg-config python3 python3-dev rsync systemtap-sdt-dev unzip wget xvfb zip zlib1g-dev execstack \
+      make nasm pkg-config python3 python3-dev rsync systemtap-sdt-dev unzip wget xvfb zip zlib1g-dev execstack unzip \
  && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /build
@@ -18,6 +18,12 @@ RUN mkdir /build/bootjdk /build/dist \
  && tar -xzf jdk21.tar.gz --directory=/build/bootjdk --strip-components=1 \
  && rm -f jdk21.tar.gz
 
+RUN wget --progress=dot:mega -O jtreg.zip https://builds.shipilev.net/jtreg/jtreg-7.5.1%2B1.zip \ 
+     && unzip jtreg.zip -d /build \
+     && rm -rf jtreg.zip
+
+ENV JT_HOME=/build/jtreg
+
 RUN find /build/bootjdk -name '*.so' | xargs execstack -c
 
 RUN git clone --single-branch --depth 1 \
@@ -27,9 +33,9 @@ RUN git clone --single-branch --depth 1 \
 WORKDIR /build/src
 RUN bash get_source.sh
 
-RUN bash configure --with-boot-jdk=/build/bootjdk --with-openssl=system --with-extra-ldflags="-Wl,-z,noexecstack"
+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)
+RUN make install
 
 # 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
@@ -42,8 +48,17 @@ java.xml,java.xml.crypto,jdk.accessibility,jdk.charsets,jdk.crypto.cryptoki,jdk.
 jdk.httpserver,jdk.incubator.vector,jdk.jsobject,jdk.localedata,jdk.naming.dns,jdk.naming.rmi,jdk.net,\
 jdk.nio.mapmode,jdk.random,jdk.sctp,jdk.security.auth,jdk.security.jgss,jdk.unsupported,jdk.unsupported.desktop,\
 jdk.xml.dom,jdk.zipfs,openj9.criu,openj9.cuda,openj9.dataaccess,openj9.gpu,openj9.jvm,\
-openj9.sharedclasses,openj9.zosconditionhandling
+openj9.sharedclasses,openj9.zosconditionhandling,jdk.test
 
+
+
+ENV JAVA_HOME=/build/src/build/linux-x86_64-server-release/images/jre
+ENV PATH="$JAVA_HOME/bin:$JAVA_HOME/lib:$PATH"
+
+WORKDIR /build/src
+RUN make test TEST=tier1 JOBS=$(nproc)
+
+WORKDIR /build/src/build/linux-x86_64-server-release/images
 RUN mv ./* /build/dist/
 
 
@@ -53,7 +68,7 @@ FROM ubuntu:25.04 AS run
 
 COPY --from=build /build/dist/jre /usr/lib/jvm/openj9-jre
 ENV JAVA_HOME=/usr/lib/jvm/openj9-jre
-ENV PATH="$JAVA_HOME/bin:$PATH"
+ENV PATH="$JAVA_HOME/bin:$JAVA_HOME/lib:$PATH"
 
 # verify installation
 RUN java --version