diff --git a/Dockerfile.openj9 b/Dockerfile.openj9
index df64960..e1f6d8f 100644
--- a/Dockerfile.openj9
+++ b/Dockerfile.openj9
@@ -54,13 +54,12 @@ openj9.sharedclasses,openj9.zosconditionhandling
 
 ENV JAVA_HOME=/build/src/build/linux-x86_64-server-release/images/jre
 ENV PATH="$JAVA_HOME/bin:$JAVA_HOME/lib:$PATH"
+ENV TEST_JDK_HOME=/build/src/build/linux-x86_64-server-release/images/jdk
 
-WORKDIR /build/src
-# jtreg:test/langtools:tier1,jtreg:test/jaxp:tier1,jtreg:test/lib-test:tier1
-RUN make test TEST="jtreg:test/jdk:tier1" JOBS=$(nproc) \
-     && make test TEST="jtreg:test/langtools:tier1" JOBS=$(nproc) \
-     && make test TEST="jtreg:test/jaxp:tier1" JOBS=$(nproc) \
-     && make test TEST="jtreg:test/lib-test:tier1" JOBS=$(nproc)
+RUN git clone https://github.com/adoptium/TKG.git \
+     && cd TKG
+     && make compile JOBS=$(nproc)
+     && make _sanity.functional.regular JOBS=$(nproc)
 
 
 WORKDIR /build/src/build/linux-x86_64-server-release/images