diff --git a/pom.xml b/pom.xml
index bde04bc52..a4d5759f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,6 @@
 		-->
 		<mvn.unit-test.goal>test</mvn.unit-test.goal>
 		<mvn.integration-test-elasticsearch.goal>integration-test</mvn.integration-test-elasticsearch.goal>
-		<mvn.integration-test-opensearch.goal>none</mvn.integration-test-opensearch.goal>
 	</properties>
 
 	<developers>
@@ -279,24 +278,6 @@
 			<scope>test</scope>
 		</dependency>
 
-
-		<!--
-		  we don't use lombok in Spring Data Elasticsearch anymore. But the dependency is set in the parent project, and so the
-		  lombok compiler stuff is executed regardless of the fact that we don't need it.
-		  On AdoptOpenJdk 16.0.0 this leads to an error, so the project does not build.
-		  Therefore we replace lombok with a jar - that just contains an empty file - that lives in a local maven repository in
-		  src/test/resources/local-maven-repo/
-		  It was installed with
-		   mvn deploy:deploy-file -DgroupId=org.projectlombok -DartifactId=lombok -Dversion=999999 -Durl=file:./src/test/resources/local-maven-repo/ -DrepositoryId=local-maven-repo -DupdateReleaseInfo=true -Dfile=path/to/empty.jar
-		-->
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<!--suppress MavenPackageUpdate -->
-			<version>999999</version>
-			<scope>test</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>org.skyscreamer</groupId>
 			<artifactId>jsonassert</artifactId>
@@ -419,20 +400,6 @@
 							</systemPropertyVariables>
 						</configuration>
 					</execution>
-					<!-- execution to run the integration tests against Opensearch -->
-					<execution>
-						<id>integration-test-opensearch</id>
-						<phase>${mvn.integration-test-opensearch.goal}</phase>
-						<goals>
-							<goal>test</goal>
-						</goals>
-						<configuration>
-							<groups>integration-test</groups>
-							<systemPropertyVariables>
-								<sde.integration-test.environment>opensearch</sde.integration-test.environment>
-							</systemPropertyVariables>
-						</configuration>
-					</execution>
 				</executions>
 			</plugin>
 			<plugin>
diff --git a/src/main/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchTemplate.java
index 9b7a99990..7ff8d6f48 100644
--- a/src/main/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchTemplate.java
+++ b/src/main/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchTemplate.java
@@ -66,7 +66,7 @@
 /**
  * This class contains methods that are common to different implementations of the {@link ElasticsearchOperations}
  * interface that use different clients, like RestHighLevelClient and the next Java client from Elasticsearch or some
- * future implementation that might use an Opensearch client. This class must not contain imports or use classes that
+ * external implementation that might use a different client. This class must not contain imports or use classes that
  * are specific to one of these implementations.
  * <p>
  * <strong>Note:</strong> Although this class is public, it is not considered to be part of the official Spring Data
diff --git a/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/IntegrationtestEnvironment.java b/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/IntegrationtestEnvironment.java
index c6f87cd8c..89b5129c6 100644
--- a/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/IntegrationtestEnvironment.java
+++ b/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/IntegrationtestEnvironment.java
@@ -20,7 +20,7 @@
  */
 public enum IntegrationtestEnvironment {
 
-	ELASTICSEARCH, OPENSEARCH, UNDEFINED;
+	ELASTICSEARCH, UNDEFINED;
 
 	public static final String SYSTEM_PROPERTY = "sde.integration-test.environment";
 
@@ -29,7 +29,6 @@ public static IntegrationtestEnvironment get() {
 		String property = System.getProperty(SYSTEM_PROPERTY, "elasticsearch");
 		return switch (property.toUpperCase()) {
 			case "ELASTICSEARCH" -> ELASTICSEARCH;
-			case "OPENSEARCH" -> OPENSEARCH;
 			default -> UNDEFINED;
 		};
 	}
diff --git a/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.jar b/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.jar
deleted file mode 100644
index f11c867c5..000000000
Binary files a/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.jar and /dev/null differ
diff --git a/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.jar.md5 b/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.jar.md5
deleted file mode 100644
index 48ea84335..000000000
--- a/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-f6bbf833798e7af0055b94865a46440e
\ No newline at end of file
diff --git a/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.jar.sha1 b/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.jar.sha1
deleted file mode 100644
index f6cee39f7..000000000
--- a/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-59ddfc2b714be7918808eacecc5739b8d277e60e
\ No newline at end of file
diff --git a/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.pom b/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.pom
deleted file mode 100644
index 3f9fa7a19..000000000
--- a/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.pom
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.projectlombok</groupId>
-  <artifactId>lombok</artifactId>
-  <version>999999</version>
-</project>
diff --git a/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.pom.md5 b/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.pom.md5
deleted file mode 100644
index 788bc4133..000000000
--- a/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-63317ccd46b6663ff35cb142e05dce10
\ No newline at end of file
diff --git a/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.pom.sha1 b/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.pom.sha1
deleted file mode 100644
index f1cddaef2..000000000
--- a/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-db353983c68ade94ae7e08acfacc0fc21ed8b64b
\ No newline at end of file
diff --git a/src/test/resources/local-maven-repo/org/projectlombok/lombok/maven-metadata.xml b/src/test/resources/local-maven-repo/org/projectlombok/lombok/maven-metadata.xml
deleted file mode 100644
index 8ddcc39a8..000000000
--- a/src/test/resources/local-maven-repo/org/projectlombok/lombok/maven-metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>org.projectlombok</groupId>
-  <artifactId>lombok</artifactId>
-  <versioning>
-    <release>999999</release>
-    <versions>
-      <version>999999</version>
-    </versions>
-    <lastUpdated>20210321155422</lastUpdated>
-  </versioning>
-</metadata>
diff --git a/src/test/resources/local-maven-repo/org/projectlombok/lombok/maven-metadata.xml.md5 b/src/test/resources/local-maven-repo/org/projectlombok/lombok/maven-metadata.xml.md5
deleted file mode 100644
index 8c58c1d52..000000000
--- a/src/test/resources/local-maven-repo/org/projectlombok/lombok/maven-metadata.xml.md5
+++ /dev/null
@@ -1 +0,0 @@
-998d3b8876980a3ef5a90adc982cc727
\ No newline at end of file
diff --git a/src/test/resources/local-maven-repo/org/projectlombok/lombok/maven-metadata.xml.sha1 b/src/test/resources/local-maven-repo/org/projectlombok/lombok/maven-metadata.xml.sha1
deleted file mode 100644
index ec41ca43b..000000000
--- a/src/test/resources/local-maven-repo/org/projectlombok/lombok/maven-metadata.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f4090a49c6eec680c075130b68bf8ee48aac4e94
\ No newline at end of file
diff --git a/src/test/resources/testcontainers-opensearch.properties b/src/test/resources/testcontainers-opensearch.properties
deleted file mode 100644
index 147af3ce5..000000000
--- a/src/test/resources/testcontainers-opensearch.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# properties defining the image, these are not passed to the container on startup
-#
-sde.testcontainers.image-name=opensearchproject/opensearch
-sde.testcontainers.image-version=1.0.0
-#
-#
-# Opensearch as default has TLS and Basic auth enabled, we do not want this here, Testcontainers cannot ignore self signed certificates
-#
-plugins.security.disabled=true