diff --git a/services/connectivity/messaging/src/test/java/org/eclipse/ditto/services/connectivity/messaging/internal/DittoTrustManagerTest.java b/services/connectivity/messaging/src/test/java/org/eclipse/ditto/services/connectivity/messaging/internal/DittoTrustManagerTest.java
deleted file mode 100644
index bb25d6ba9e..0000000000
--- a/services/connectivity/messaging/src/test/java/org/eclipse/ditto/services/connectivity/messaging/internal/DittoTrustManagerTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2017-2018 Bosch Software Innovations GmbH.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/org/documents/epl-2.0/index.php
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-
-package org.eclipse.ditto.services.connectivity.messaging.internal;
-
-import java.io.ByteArrayInputStream;
-import java.nio.charset.StandardCharsets;
-import java.security.KeyStore;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-
-import org.eclipse.ditto.services.connectivity.messaging.TestConstants.Certificates;
-import org.junit.Test;
-
-/**
- * Tests {@link org.eclipse.ditto.services.connectivity.messaging.internal.DittoTrustManager}.
- */
-public final class DittoTrustManagerTest {
-
-    private static final String AWS_IOT_EU_ENDPOINT = "aws-account-id.iot.eu-central-1.amazonaws.com";
-    private static final String AWS_IOT_US_ENDPOINT = "aws-account-id.iot.us-east-1.amazonaws.com";
-    private static final CertificateFactory X509_CERTIFICATE_FACTORY;
-    private static final String AUTH_TYPE = "RSA";
-
-    static {
-        try {
-            X509_CERTIFICATE_FACTORY = CertificateFactory.getInstance("X.509");
-        } catch (final CertificateException e) {
-            throw new Error("FATAL: failed to load X.509 certificate factory", e);
-        }
-    }
-
-    /**
-     * Test that Ditto trust manager trusts an AWS IoT certificate when it trusts its CAs.
-     * WARNING:
-     * The AWS-IoT certificate expires on 28.11.2018.
-     * When this test fails, update it or mock it.
-     *
-     * @throws Exception if the AWS IoT certificate is not trusted.
-     */
-    @Test
-    public void testAwsIotCertificatesWithValidEndpoint() throws Exception {
-        testAwsIotCertificates(AWS_IOT_EU_ENDPOINT);
-    }
-
-    @Test(expected = CertificateException.class)
-    public void testAwsIotCertificatesWithInvalidEndpoint() throws Exception {
-        testAwsIotCertificates(AWS_IOT_US_ENDPOINT);
-    }
-
-    private void testAwsIotCertificates(final String endpoint) throws Exception {
-
-        final KeyStore keyStore = TrustManagerFactory.emptyKeyStore();
-
-        final TrustManager[] trustManagers =
-                TrustManagerFactory.newTrustManager(Certificates.AWS_CA_CRT, () -> keyStore);
-
-        final List<X509TrustManager> dittoTrustManagers =
-                Stream.of(DittoTrustManager.wrapTrustManagers(trustManagers,
-                        endpoint)).map(tm -> ((X509TrustManager) tm)).collect(Collectors.toList());
-
-        final byte[] bytes = Certificates.AWS_IOT_CRT.getBytes(StandardCharsets.US_ASCII);
-
-
-        final X509Certificate[] x509Certificates =
-                X509_CERTIFICATE_FACTORY.generateCertificates(new ByteArrayInputStream(bytes))
-                        .stream()
-                        .map(crt -> ((X509Certificate) crt))
-                        .toArray(X509Certificate[]::new);
-
-        for (final X509TrustManager dtm : dittoTrustManagers) {
-            dtm.checkServerTrusted(x509Certificates, AUTH_TYPE);
-        }
-    }
-}