diff --git a/smoke-tests/matrix/build.gradle b/smoke-tests/matrix/build.gradle
index 328a3e11ff..caf349f943 100644
--- a/smoke-tests/matrix/build.gradle
+++ b/smoke-tests/matrix/build.gradle
@@ -81,7 +81,7 @@ def windowsTargets = [
   ],
   "wildfly" : [
     [version: ["13.0.0.Final"], vm: ["hotspot", "openj9"], jdk: ["8"]],
-    [version: ["17.0.1.Final", "21.0.0.Final"], vm: ["hotspot", "openj9"], jdk: ["8", "11"]]
+    [version: ["17.0.1.Final", "21.0.0.Final"], vm: ["hotspot", "openj9"], jdk: ["8", "11", "15", "16"]]
   ],
   "liberty" : [
     [version: ["20.0.0.12"], vm: ["hotspot", "openj9"], jdk: ["8", "11", "15", "16"], args: [release: "2020-11-11_0736"]]