diff --git a/build-test-batch.xml b/build-test-batch.xml
index 5a74ff46c69d7f..f32c4e3efc0fba 100644
--- a/build-test-batch.xml
+++ b/build-test-batch.xml
@@ -7208,6 +7208,21 @@ information. Make sure to commit in all format-javadoc results.
 		</antcall>
 	</target>
 
+	<target name="modules-integration-project-templates-jdk21">
+		<get-java-jdk-home type="zulu" version="21" />
+
+		<echo append="true" file="build.${user.name}.properties">
+			junit.jvm.override=${java.jdk.home}/bin/java
+			junit.jvm.override.version=21</echo>
+
+		<antcall target="modules-unit-jdk8">
+			<param name="junit.jvm.override" value="${java.jdk.home}/bin/java" />
+			<param name="junit.jvm.override.version" value="21" />
+			<param name="project.templates.test" value="true" />
+			<param name="project.templates.test.builds" value="true" />
+		</antcall>
+	</target>
+
 	<target name="modules-integration-sqlserver2017-jdk8">
 		<run-modules-integration-test database.type="sqlserver" database.version="2017" />
 	</target>
@@ -7435,6 +7450,21 @@ junit.jvm.override.version=21</echo>
 		</antcall>
 	</target>
 
+	<target name="modules-unit-project-templates-jdk21">
+		<get-java-jdk-home type="zulu" version="21" />
+
+		<echo append="true" file="build.${user.name}.properties">
+			junit.jvm.override=${java.jdk.home}/bin/java
+			junit.jvm.override.version=21</echo>
+
+		<antcall target="modules-unit-jdk8">
+			<param name="junit.jvm.override" value="${java.jdk.home}/bin/java" />
+			<param name="junit.jvm.override.version" value="21" />
+			<param name="project.templates.test" value="true" />
+			<param name="project.templates.test.builds" value="false" />
+		</antcall>
+	</target>
+
 	<target name="oracle-service-start">
 		<exec executable="service" failonerror="true">
 			<arg line="oracledb start" />
diff --git a/test.properties b/test.properties
index 5cf92c6dbcfcfc..642d715057f7a6 100644
--- a/test.properties
+++ b/test.properties
@@ -1301,9 +1301,11 @@
     test.batch.axis.max.size[modules-compile-jdk8]=35
     test.batch.axis.max.size[modules-integration-*]=20
     test.batch.axis.max.size[modules-integration-project-templates-jdk8]=10
+    test.batch.axis.max.size[modules-integration-project-templates-jdk21]=5
     test.batch.axis.max.size[modules-semantic-versioning-jdk8]=30
     test.batch.axis.max.size[modules-unit-*]=50
     test.batch.axis.max.size[modules-unit-project-templates-jdk8]=25
+    test.batch.axis.max.size[modules-unit-project-templates-jdk21_zulu]=15
     test.batch.axis.max.size[semantic-versioning-jdk8]=50
     test.batch.axis.max.size[tck-jdk8]=50
     test.batch.axis.max.size[unit-*]=5000
@@ -1343,8 +1345,10 @@
     test.batch.class.names.filter[modules-integration-*]=**/src/testIntegration/**/*Test.java
     test.batch.class.names.filter[modules-integration-analytics-cloud]=**/testIntegration/**/*Test.java
     test.batch.class.names.filter[modules-integration-project-templates-jdk8]=${test.batch.class.names.filter[modules-unit-*]}
+    test.batch.class.names.filter[modules-integration-project-templates-jdk21_zulu]=${test.batch.class.names.filter[modules-unit-*]}
     test.batch.class.names.filter[modules-unit-*]=**/src/test/**/*Test.java
     test.batch.class.names.filter[modules-unit-project-templates-jdk8]=${test.batch.class.names.filter[modules-unit-*]}
+    test.batch.class.names.filter[modules-unit-project-templates-jdk21_zulu]=${test.batch.class.names.filter[modules-unit-*]}
     test.batch.class.names.filter[unit-*]=**/test/unit/**/*Test.java
 
     test.batch.class.names.includes=\
@@ -1354,6 +1358,7 @@
 
     test.batch.class.names.includes[junit-test-csv-report-jdk8]=${test.batch.class.names.includes}
     test.batch.class.names.includes[modules-integration-project-templates-jdk8]=**/project-templates/**/src/test/**/*Test.java
+    test.batch.class.names.includes[modules-integration-project-templates-jdk21_zulu]=**/project-templates/**/src/test/**/*Test.java
     test.batch.class.names.includes[modules-integration-*-jdk8]=**/src/testIntegration/**/*Test.java
 
     test.batch.class.names.includes[modules-integration-*-jdk8_stable]=\
@@ -1369,6 +1374,7 @@
         **/portal-upgrade-impl/**/*Test.java
 
     test.batch.class.names.includes[modules-unit-project-templates-jdk8]=**/project-templates/**/src/test/**/*Test.java
+    test.batch.class.names.includes[modules-unit-project-templates-jdk21_zulu]=**/project-templates/**/src/test/**/*Test.java
 
     test.batch.class.names.includes[tck-jdk8]=deploy/target/deploy-files/tck-*.war
     test.batch.class.names.includes[unit-jdk*]=**/test/unit/**/*Test.java
@@ -5011,8 +5017,10 @@ test.batch.run.property.query[functional-orcllinux9-tomcat90-mysql57-jdk8]=\
 
     test.batch.names[dev-tools]=\
         modules-integration-project-templates-jdk8,\
+        modules-integration-project-templates-jdk21_zulu,\
         modules-unit-jdk8,\
         modules-unit-project-templates-jdk8,\
+        modules-unit-project-templates-jdk21_zulu,\
         source-format-current-branch-jdk8
 
     #