diff --git a/build-test-tomcat-db2.xml b/build-test-tomcat-db2.xml
index b0f2264db11ae6..16d3eefe21582c 100644
--- a/build-test-tomcat-db2.xml
+++ b/build-test-tomcat-db2.xml
@@ -18,10 +18,6 @@
 			<param name="test.class" value="${test.class}" />
 		</antcall>
 
-		<replaceregexp
-			file="test.${user.name}.properties"
-			match="(\n).*## Autogenerated Database Properties(.*\n)+## Autogenerated Database Properties.*\r?\n"
-			replace=""
-		/>
+		<antcall inheritAll="false" target="clean-up-database-properties" />
 	</target>
 </project>
\ No newline at end of file
diff --git a/build-test-tomcat-mariadb.xml b/build-test-tomcat-mariadb.xml
index 96dd31f3d08305..35c675a0247efe 100644
--- a/build-test-tomcat-mariadb.xml
+++ b/build-test-tomcat-mariadb.xml
@@ -16,10 +16,6 @@
 			<param name="test.class" value="${test.class}" />
 		</antcall>
 
-		<replaceregexp
-			file="test.${user.name}.properties"
-			match="(\n).*## Autogenerated Database Properties(.*\n)+## Autogenerated Database Properties.*\r?\n"
-			replace=""
-		/>
+		<antcall inheritAll="false" target="clean-up-database-properties" />
 	</target>
 </project>
\ No newline at end of file
diff --git a/build-test-tomcat-mysql.xml b/build-test-tomcat-mysql.xml
index 7f72550b804ad5..a75920f31b22dd 100644
--- a/build-test-tomcat-mysql.xml
+++ b/build-test-tomcat-mysql.xml
@@ -16,10 +16,6 @@
 			<param name="test.class" value="${test.class}" />
 		</antcall>
 
-		<replaceregexp
-			file="test.${user.name}.properties"
-			match="(\n).*## Autogenerated Database Properties(.*\n)+## Autogenerated Database Properties.*\r?\n"
-			replace=""
-		/>
+		<antcall inheritAll="false" target="clean-up-database-properties" />
 	</target>
 </project>
\ No newline at end of file
diff --git a/build-test-tomcat-oracle.xml b/build-test-tomcat-oracle.xml
index a5e16390ff4732..197add8103bb33 100644
--- a/build-test-tomcat-oracle.xml
+++ b/build-test-tomcat-oracle.xml
@@ -18,16 +18,6 @@
 			<param name="test.class" value="${test.class}" />
 		</antcall>
 
-		<replaceregexp
-			file="test.${user.name}.properties"
-			match="(\n).*## Autogenerated Database Properties(.*\n)+## Autogenerated Database Properties.*\r?\n"
-			replace=""
-		/>
-
-		<replaceregexp
-			file="sql/sql.${user.name}.properties"
-			match="(\n).*## Autogenerated Database Properties(.*\n)+## Autogenerated Database Properties.*\r?\n"
-			replace=""
-		/>
+		<antcall inheritAll="false" target="clean-up-database-properties" />
 	</target>
 </project>
\ No newline at end of file
diff --git a/build-test-tomcat-postgresql.xml b/build-test-tomcat-postgresql.xml
index bca65bb63c458a..4ce9dd3e39c1c3 100644
--- a/build-test-tomcat-postgresql.xml
+++ b/build-test-tomcat-postgresql.xml
@@ -16,10 +16,6 @@
 			<param name="test.class" value="${test.class}" />
 		</antcall>
 
-		<replaceregexp
-			file="test.${user.name}.properties"
-			match="(\n).*## Autogenerated Database Properties(.*\n)+## Autogenerated Database Properties.*\r?\n"
-			replace=""
-		/>
+		<antcall inheritAll="false" target="clean-up-database-properties" />
 	</target>
 </project>
\ No newline at end of file
diff --git a/build-test-tomcat-sqlserver.xml b/build-test-tomcat-sqlserver.xml
index eab14675d2cd64..e5a5153c67184b 100644
--- a/build-test-tomcat-sqlserver.xml
+++ b/build-test-tomcat-sqlserver.xml
@@ -18,10 +18,6 @@
 			<param name="test.class" value="${test.class}" />
 		</antcall>
 
-		<replaceregexp
-			file="test.${user.name}.properties"
-			match="(\n).*## Autogenerated Database Properties(.*\n)+## Autogenerated Database Properties.*\r?\n"
-			replace=""
-		/>
+		<antcall inheritAll="false" target="clean-up-database-properties" />
 	</target>
 </project>
\ No newline at end of file
diff --git a/build-test.xml b/build-test.xml
index 2253d5c27efe7d..7e2fcbcc0837ea 100644
--- a/build-test.xml
+++ b/build-test.xml
@@ -8660,6 +8660,25 @@ go</echo>
 		</delete>
 	</target>
 
+	<target name="clean-up-database-properties">
+		<replaceregexp
+			file="test.${user.name}.properties"
+			match="(\n).*## Autogenerated Database Properties(.*\n)+## Autogenerated Database Properties.*\r?\n"
+			replace=""
+		/>
+
+		<if>
+			<available file="sql/sql.${user.name}.properties" />
+			<then>
+				<replaceregexp
+					file="sql/sql.${user.name}.properties"
+					match="(\n).*## Autogenerated Database Properties(.*\n)+## Autogenerated Database Properties.*\r?\n"
+					replace=""
+				/>
+			</then>
+		</if>
+	</target>
+
 	<target name="clean-up-db2-processes">
 		<if>
 			<os family="unix" />
@@ -15510,11 +15529,7 @@ mail.send.blacklist=</echo>
 
 		<touch file="test.${user.name}.properties" />
 
-		<replaceregexp
-			file="test.${user.name}.properties"
-			match="(\n).*## Autogenerated Database Properties(.*\n)+## Autogenerated Database Properties.*\r?\n"
-			replace=""
-		/>
+		<antcall inheritAll="false" target="clean-up-database-properties" />
 
 		<echo append="true" file="test.${user.name}.properties"><![CDATA[
 ## Autogenerated Database Properties
@@ -15576,11 +15591,7 @@ database.type=db2
 				<isset property="skip.property.cleanup" />
 			</not>
 			<then>
-				<replaceregexp
-					file="test.${user.name}.properties"
-					match="(\n).*## Autogenerated Database Properties(.*\n)+## Autogenerated Database Properties.*\r?\n"
-					replace=""
-				/>
+				<antcall inheritAll="false" target="clean-up-database-properties" />
 			</then>
 		</if>
 	</target>
@@ -15610,11 +15621,7 @@ database.type=db2
 
 		<touch file="test.${user.name}.properties" />
 
-		<replaceregexp
-			file="test.${user.name}.properties"
-			match="(\n).*## Autogenerated Database Properties(.*\n)+## Autogenerated Database Properties.*\r?\n"
-			replace=""
-		/>
+		<antcall inheritAll="false" target="clean-up-database-properties" />
 
 		<echo append="true" file="test.${user.name}.properties"><![CDATA[
 ## Autogenerated Database Properties
@@ -15662,11 +15669,7 @@ database.type=mariadb
 				<isset property="skip.property.cleanup" />
 			</not>
 			<then>
-				<replaceregexp
-					file="test.${user.name}.properties"
-					match="(\n).*## Autogenerated Database Properties(.*\n)+## Autogenerated Database Properties.*\r?\n"
-					replace=""
-				/>
+				<antcall inheritAll="false" target="clean-up-database-properties" />
 			</then>
 		</if>
 	</target>
@@ -15683,11 +15686,7 @@ database.type=mariadb
 
 		<touch file="test.${user.name}.properties" />
 
-		<replaceregexp
-			file="test.${user.name}.properties"
-			match="(\n).*## Autogenerated Database Properties(.*\n)+## Autogenerated Database Properties.*\r?\n"
-			replace=""
-		/>
+		<antcall inheritAll="false" target="clean-up-database-properties" />
 
 		<echo append="true" file="test.${user.name}.properties"><![CDATA[
 ## Autogenerated Database Properties
@@ -15735,11 +15734,7 @@ database.type=mysql
 				<isset property="skip.property.cleanup" />
 			</not>
 			<then>
-				<replaceregexp
-					file="test.${user.name}.properties"
-					match="(\n).*## Autogenerated Database Properties(.*\n)+## Autogenerated Database Properties.*\r?\n"
-					replace=""
-				/>
+				<antcall inheritAll="false" target="clean-up-database-properties" />
 			</then>
 		</if>
 	</target>
@@ -15749,17 +15744,7 @@ database.type=mysql
 
 		<touch file="sql/sql.${user.name}.properties" />
 
-		<replaceregexp
-			file="test.${user.name}.properties"
-			match="(\n).*## Autogenerated Database Properties(.*\n)+## Autogenerated Database Properties.*\r?\n"
-			replace=""
-		/>
-
-		<replaceregexp
-			file="sql/sql.${user.name}.properties"
-			match="(\n).*## Autogenerated Database Properties(.*\n)+## Autogenerated Database Properties.*\r?\n"
-			replace=""
-		/>
+		<antcall inheritAll="false" target="clean-up-database-properties" />
 
 		<echo append="true" file="test.${user.name}.properties"><![CDATA[
 ## Autogenerated Database Properties
@@ -15828,17 +15813,7 @@ oracle.admin.user=system
 				<isset property="skip.property.cleanup" />
 			</not>
 			<then>
-				<replaceregexp
-					file="test.${user.name}.properties"
-					match="(\n).*## Autogenerated Database Properties(.*\n)+## Autogenerated Database Properties.*\r?\n"
-					replace=""
-				/>
-
-				<replaceregexp
-					file="sql/sql.${user.name}.properties"
-					match="(\n).*## Autogenerated Database Properties(.*\n)+## Autogenerated Database Properties.*\r?\n"
-					replace=""
-				/>
+				<antcall inheritAll="false" target="clean-up-database-properties" />
 			</then>
 		</if>
 	</target>
@@ -15855,11 +15830,7 @@ oracle.admin.user=system
 
 		<touch file="test.${user.name}.properties" />
 
-		<replaceregexp
-			file="test.${user.name}.properties"
-			match="(\n).*## Autogenerated Database Properties(.*\n)+## Autogenerated Database Properties.*\r?\n"
-			replace=""
-		/>
+		<antcall inheritAll="false" target="clean-up-database-properties" />
 
 		<echo append="true" file="test.${user.name}.properties"><![CDATA[
 ## Autogenerated Database Properties
@@ -15907,11 +15878,7 @@ database.type=postgresql
 				<isset property="skip.property.cleanup" />
 			</not>
 			<then>
-				<replaceregexp
-					file="test.${user.name}.properties"
-					match="(\n).*## Autogenerated Database Properties(.*\n)+## Autogenerated Database Properties.*\r?\n"
-					replace=""
-				/>
+				<antcall inheritAll="false" target="clean-up-database-properties" />
 			</then>
 		</if>
 	</target>
@@ -15938,11 +15905,7 @@ database.type=postgresql
 
 		<touch file="test.${user.name}.properties" />
 
-		<replaceregexp
-			file="test.${user.name}.properties"
-			match="(\n).*## Autogenerated Database Properties(.*\n)+## Autogenerated Database Properties.*\r?\n"
-			replace=""
-		/>
+		<antcall inheritAll="false" target="clean-up-database-properties" />
 
 		<echo append="true" file="test.${user.name}.properties"><![CDATA[
 ## Autogenerated Database Properties
@@ -16004,11 +15967,7 @@ database.type=sqlserver
 				<isset property="skip.property.cleanup" />
 			</not>
 			<then>
-				<replaceregexp
-					file="test.${user.name}.properties"
-					match="(\n).*## Autogenerated Database Properties(.*\n)+## Autogenerated Database Properties.*\r?\n"
-					replace=""
-				/>
+				<antcall inheritAll="false" target="clean-up-database-properties" />
 			</then>
 		</if>
 	</target>