diff --git a/build-test-batch.xml b/build-test-batch.xml
index 3bca0da41fae0c..71f092a352a55e 100644
--- a/build-test-batch.xml
+++ b/build-test-batch.xml
@@ -948,7 +948,7 @@ app.server.type=@{app.server.type}]]></echo>
 				</then>
 			</if>
 
-			<prepare-elasticsearch-configuration />
+			<prepare-portal-elasticsearch-osgi-configuration />
 
 			<lstopwatch action="start" name="prepare-test-build-dist.bundles.@{app.server.type}.compile-test" />
 
diff --git a/build-test-elasticsearch6.xml b/build-test-elasticsearch6.xml
index 50688eb2ee3598..d9e341fe65b33b 100644
--- a/build-test-elasticsearch6.xml
+++ b/build-test-elasticsearch6.xml
@@ -87,7 +87,7 @@ xpack.security.sessionTimeout: 600000</echo>
 		</sequential>
 	</macrodef>
 
-	<macrodef name="configure-portal-elasticsearch-osgi-properties">
+	<macrodef name="configure-portal-remote-elasticsearch-osgi-properties">
 		<sequential>
 			<echo append="true" file="${liferay.home}/osgi/configs/com.liferay.portal.search.elasticsearch6.configuration.ElasticsearchConfiguration.config">${line.separator}operationMode="REMOTE"</echo>
 		</sequential>
@@ -768,7 +768,7 @@ xpack.monitoring.collection.enabled: true</echo>
 			</then>
 		</if>
 
-		<configure-portal-elasticsearch-osgi-properties />
+		<configure-portal-remote-elasticsearch-osgi-properties />
 
 		<get-testcase-property property.name="remote.elasticsearch.cluster.size" />
 
diff --git a/build-test-elasticsearch7.xml b/build-test-elasticsearch7.xml
index 92c35995b0ed82..997ee94ec7cc66 100644
--- a/build-test-elasticsearch7.xml
+++ b/build-test-elasticsearch7.xml
@@ -143,7 +143,7 @@ xpack.security.sessionTimeout: 600000</echo>
 		</sequential>
 	</macrodef>
 
-	<macrodef name="configure-portal-elasticsearch-osgi-properties">
+	<macrodef name="configure-portal-remote-elasticsearch-osgi-properties">
 		<sequential>
 			<echo append="true" file="${liferay.home}/osgi/configs/com.liferay.portal.search.elasticsearch7.configuration.ElasticsearchConfiguration.config">${line.separator}operationMode="REMOTE"
 remoteClusterConnectionId="remote"</echo>
@@ -911,7 +911,7 @@ xpack.monitoring.collection.enabled: true</echo>
 			</then>
 		</if>
 
-		<configure-portal-elasticsearch-osgi-properties />
+		<configure-portal-remote-elasticsearch-osgi-properties />
 
 		<get-testcase-property property.name="remote.elasticsearch.cluster.size" />
 
diff --git a/build-test.xml b/build-test.xml
index ceb009e09293a9..4c76282750b9b3 100644
--- a/build-test.xml
+++ b/build-test.xml
@@ -234,6 +234,12 @@ module.framework.properties.osgi.console=11312</echo>
 		</sequential>
 	</macrodef>
 
+	<macrodef name="delete-default-elasticsearch-connection-config">
+		<sequential>
+			<delete file="${liferay.home}/osgi/configs/com.liferay.portal.search.elasticsearch7.configuration.ElasticsearchConnectionConfiguration-default.config" />
+		</sequential>
+	</macrodef>
+
 	<macrodef name="generate-gulp-user-config-json">
 		<attribute name="portlet.name" />
 
@@ -1809,19 +1815,6 @@ jdbc.default.password=${database.password}</echo>
 		</sequential>
 	</macrodef>
 
-	<macrodef name="prepare-elasticsearch-configuration">
-		<sequential>
-			<echo file="${liferay.home}/osgi/configs/com.liferay.portal.search.elasticsearch6.configuration.ElasticsearchConfiguration.config">logExceptionsOnly="false"</echo>
-			<echo file="${liferay.home}/osgi/configs/com.liferay.portal.search.elasticsearch7.configuration.ElasticsearchConfiguration.config">logExceptionsOnly="false"</echo>
-		</sequential>
-	</macrodef>
-
-	<macrodef name="prepare-elasticsearch-connection-config">
-		<sequential>
-			<delete file="${liferay.home}/osgi/configs/com.liferay.portal.search.elasticsearch7.configuration.ElasticsearchConnectionConfiguration-default.config" />
-		</sequential>
-	</macrodef>
-
 	<macrodef name="prepare-gecko-driver">
 		<sequential>
 			<stop-gecko-driver />
@@ -2047,6 +2040,13 @@ jdbc.default.password=${database.password}</echo>
 		</sequential>
 	</macrodef>
 
+	<macrodef name="prepare-portal-elasticsearch-osgi-configuration">
+		<sequential>
+			<echo file="${liferay.home}/osgi/configs/com.liferay.portal.search.elasticsearch6.configuration.ElasticsearchConfiguration.config">logExceptionsOnly="false"</echo>
+			<echo file="${liferay.home}/osgi/configs/com.liferay.portal.search.elasticsearch7.configuration.ElasticsearchConfiguration.config">logExceptionsOnly="false"</echo>
+		</sequential>
+	</macrodef>
+
 	<macrodef name="prepare-portal-legacy-properties">
 		<attribute default="portal-impl/src/portal-ext.properties" name="portal.ext.properties.file.path" />
 		<attribute name="portal.major.version" />
@@ -7693,7 +7693,7 @@ osb.lcs.portlet.oauth.consumer.secret=${osb.lcs.portlet.oauth.consumer.secret}</
 			</then>
 		</if>
 
-		<prepare-elasticsearch-configuration />
+		<prepare-portal-elasticsearch-osgi-configuration />
 	</target>
 
 	<target name="prepare-patching-tool">
@@ -12120,7 +12120,7 @@ module.framework.properties.blacklist.portal.profile.names=${blacklist.portal.pr
 				<equals arg1="${remote.elasticsearch.enabled}" arg2="true" />
 			</and>
 			<then>
-				<prepare-elasticsearch-connection-config />
+				<delete-default-elasticsearch-connection-config />
 			</then>
 		</if>