diff --git a/Dockerfile.openj9 b/Dockerfile.openj9
index 0df04a7..5ffffce 100644
--- a/Dockerfile.openj9
+++ b/Dockerfile.openj9
@@ -18,8 +18,6 @@ RUN mkdir /build/bootjdk /build/dist \
  && tar -xzf jdk21.tar.gz --directory=/build/bootjdk --strip-components=1 \
  && rm -f jdk21.tar.gz
 
-RUN find /build/bootjdk -name '*.so' | xargs execstack -c
-
 RUN git clone --single-branch --depth 1 \
       https://github.com/ibmruntimes/openj9-openjdk-jdk21.git \
       /build/src
@@ -29,7 +27,6 @@ RUN bash get_source.sh
 
 RUN bash configure --with-boot-jdk=/build/bootjdk --with-openssl=system --with-extra-ldflags="-Wl,-z,noexecstack"
 RUN make all JOBS=$(nproc)
-RUN make test 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
@@ -46,6 +43,11 @@ openj9.sharedclasses,openj9.zosconditionhandling
 
 RUN mv ./* /build/dist/
 
+ENV JT_JAVA=/build/bootjdk
+RUN cd /build/dist/jdk && ./bin/jtreg \
+    -jdk:/build/src/build/linux-x86_64-server-release/images/jdk -agentvm -verbose:summary \
+    -w build/jtreg/work -r build/jtreg/report \
+    test/java/lang/Class
 
 # ------