diff --git a/httpasyncclient/src/test/java/io/wcm/caravan/commons/httpasyncclient/impl/HttpClientItemAsyncTest.java b/httpasyncclient/src/test/java/io/wcm/caravan/commons/httpasyncclient/impl/HttpClientItemAsyncTest.java
index de1579e..d4418d8 100644
--- a/httpasyncclient/src/test/java/io/wcm/caravan/commons/httpasyncclient/impl/HttpClientItemAsyncTest.java
+++ b/httpasyncclient/src/test/java/io/wcm/caravan/commons/httpasyncclient/impl/HttpClientItemAsyncTest.java
@@ -20,7 +20,6 @@
 package io.wcm.caravan.commons.httpasyncclient.impl;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
@@ -30,7 +29,6 @@
 import org.apache.http.client.config.CookieSpecs;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.config.Registry;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
 import org.apache.http.impl.nio.conn.PoolingNHttpClientConnectionManager;
 import org.apache.http.nio.client.HttpAsyncClient;
 import org.apache.http.nio.conn.SchemeIOSessionStrategy;
@@ -181,7 +179,7 @@ public void testWithClientCertificate() {
     Registry<SchemeIOSessionStrategy> schemeRegistry = HttpClientTestUtils.getSchemeRegistry(client);
     SchemeIOSessionStrategy schemeSocketFactory = schemeRegistry.lookup("https");
 
-    assertNotEquals(schemeSocketFactory, SSLConnectionSocketFactory.getSocketFactory());
+    assertNotNull(schemeSocketFactory);
     item.close();
   }
 
diff --git a/httpclient/src/main/java/io/wcm/caravan/commons/httpclient/impl/HttpClientConfigImpl.java b/httpclient/src/main/java/io/wcm/caravan/commons/httpclient/impl/HttpClientConfigImpl.java
index e78289e..5616135 100644
--- a/httpclient/src/main/java/io/wcm/caravan/commons/httpclient/impl/HttpClientConfigImpl.java
+++ b/httpclient/src/main/java/io/wcm/caravan/commons/httpclient/impl/HttpClientConfigImpl.java
@@ -52,7 +52,7 @@ public class HttpClientConfigImpl extends AbstractHttpClientConfig {
 
   @ObjectClassDefinition(name = "wcm.io Caravan HTTP Client Configuration",
       description = "Allows to configure special HTTP client settings for target hosts.")
-  static @interface Config {
+  @interface Config {
 
     /**
      * Host pattern