diff --git a/xta-adapter/pom.xml b/xta-adapter/pom.xml
index 772694d19667161a78fe7cd036935431333b2dc1..784b69c9ac4e88ad29b0ed444ad9061c01d75033 100644
--- a/xta-adapter/pom.xml
+++ b/xta-adapter/pom.xml
@@ -94,12 +94,6 @@
 			<version>${okio.version}</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.squareup.okhttp3</groupId>
-			<artifactId>okhttp-tls</artifactId>
-			<version>${okio.version}</version>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 	
 	<build>
diff --git a/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaServiceITCase.java b/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaServiceITCase.java
index f65beead1563a8ece951653ffce46c68d0c94962..5a11b63e6be1d660bca89d65a5628c7c63aa9a1a 100644
--- a/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaServiceITCase.java
+++ b/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaServiceITCase.java
@@ -13,7 +13,6 @@ import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 
@@ -21,8 +20,7 @@ import de.ozgcloud.eingang.Application;
 import lombok.SneakyThrows;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
-import okhttp3.tls.HandshakeCertificates;
-import okhttp3.tls.HeldCertificate;
+import okhttp3.mockwebserver.internal.duplex.DuplexResponseBody;
 
 @ActiveProfiles({ "itcase", "local" })
 @SpringBootTest(classes = Application.class)
@@ -36,34 +34,16 @@ class XtaServiceITCase {
 	@Autowired
 	private XtaProperties properties;
 
-	@Autowired
-	@Qualifier("xtaKeyStore")
-	KeyStore xtaKeyStore;
 
 	@BeforeEach
 	@SneakyThrows
 	public void createServer() {
 		nachrichtenBrokerMock = new MockWebServer();
-		nachrichtenBrokerMock.requireClientAuth();
-		{
-			// Setup trust between client and the NachrichtenbrokerMock for HTTPS
-			// (See https://github.com/square/okhttp/blob/master/okhttp-tls/README.md)
-			HeldCertificate localhostCertificate = new HeldCertificate.Builder()
-					.addSubjectAlternativeName("localhost")
-					.build();
-
-			HandshakeCertificates serverCertificates = new HandshakeCertificates.Builder()
-					.heldCertificate(localhostCertificate)
-					.addTrustedCertificate((X509Certificate) xtaKeyStore.getCertificate("xtatestkey"))
-					.build();
-
-			xtaKeyStore.setCertificateEntry("nachrichtenbroker", localhostCertificate.certificate());
-
-			nachrichtenBrokerMock.useHttps(serverCertificates.sslSocketFactory(), false);
-		}
 
 		nachrichtenBrokerMock.start(InetAddress.getByName("127.0.0.1"), 0);
-		properties.getServer().setAddress(nachrichtenBrokerMock.getHostName() + ":" + nachrichtenBrokerMock.getPort());
+		var serverProperties = properties.getServer();
+		serverProperties.setAddress(nachrichtenBrokerMock.getHostName() + ":" + nachrichtenBrokerMock.getPort());
+		serverProperties.setProtocol("http");
 	}
 
 	@AfterEach
@@ -78,7 +58,8 @@ class XtaServiceITCase {
 
 		@BeforeEach
 		void enqueueResponse() {
-			nachrichtenBrokerMock.enqueue(new MockResponse().setBody("<some/>"));
+			var response = new MockResponse().setBody("<some/>");
+			nachrichtenBrokerMock.enqueue(response);
 		}
 
 		@AfterEach