diff --git a/src/main/java/com/eactive/eai/authoutbound/client/impl/HttpClientAccessTokenServiceWithBase64Header.java b/src/main/java/com/eactive/eai/authoutbound/client/impl/HttpClientAccessTokenServiceWithBase64Header.java
index 30ef683..48e32a3 100644
--- a/src/main/java/com/eactive/eai/authoutbound/client/impl/HttpClientAccessTokenServiceWithBase64Header.java
+++ b/src/main/java/com/eactive/eai/authoutbound/client/impl/HttpClientAccessTokenServiceWithBase64Header.java
@@ -173,7 +173,12 @@ public class HttpClientAccessTokenServiceWithBase64Header implements HttpClientA
 				cmBuilder.setSSLSocketFactory(sslSocketFactory);
 			} else {
 				sslContext = SSLContextBuilder.create().loadTrustMaterial(new TrustAllStrategy()).build();
-				SSLConnectionSocketFactory csf = new SSLConnectionSocketFactory(sslContext);
+				SSLConnectionSocketFactory csf = null;
+				if (testMode) {
+					csf = new SSLConnectionSocketFactory(sslContext, NoopHostnameVerifier.INSTANCE);
+				} else {
+					csf = new SSLConnectionSocketFactory(sslContext);
+				}
 				cmBuilder.setSSLSocketFactory(csf);
 			}
 		} catch (KeyManagementException | NoSuchAlgorithmException | KeyStoreException | CertificateException
diff --git a/src/main/java/com/eactive/eai/authoutbound/client/impl/HttpClientAccessTokenServiceWithBase64NiceOn.java b/src/main/java/com/eactive/eai/authoutbound/client/impl/HttpClientAccessTokenServiceWithBase64NiceOn.java
index 450962a..d407a08 100644
--- a/src/main/java/com/eactive/eai/authoutbound/client/impl/HttpClientAccessTokenServiceWithBase64NiceOn.java
+++ b/src/main/java/com/eactive/eai/authoutbound/client/impl/HttpClientAccessTokenServiceWithBase64NiceOn.java
@@ -181,7 +181,12 @@ public class HttpClientAccessTokenServiceWithBase64NiceOn implements HttpClientA
 				cmBuilder.setSSLSocketFactory(sslSocketFactory);
 			} else {
 				sslContext = SSLContextBuilder.create().loadTrustMaterial(new TrustAllStrategy()).build();
-				SSLConnectionSocketFactory csf = new SSLConnectionSocketFactory(sslContext);
+				SSLConnectionSocketFactory csf = null;
+				if (testMode) {
+					csf = new SSLConnectionSocketFactory(sslContext, NoopHostnameVerifier.INSTANCE);
+				} else {
+					csf = new SSLConnectionSocketFactory(sslContext);
+				}
 				cmBuilder.setSSLSocketFactory(csf);
 			}
 		} catch (KeyManagementException | NoSuchAlgorithmException | KeyStoreException | CertificateException
diff --git a/src/main/java/com/eactive/eai/authoutbound/client/impl/HttpClientAccessTokenServiceWithDefault.java b/src/main/java/com/eactive/eai/authoutbound/client/impl/HttpClientAccessTokenServiceWithDefault.java
index d1593f9..bec2aef 100644
--- a/src/main/java/com/eactive/eai/authoutbound/client/impl/HttpClientAccessTokenServiceWithDefault.java
+++ b/src/main/java/com/eactive/eai/authoutbound/client/impl/HttpClientAccessTokenServiceWithDefault.java
@@ -180,7 +180,12 @@ public class HttpClientAccessTokenServiceWithDefault implements HttpClientAccess
 				cmBuilder.setSSLSocketFactory(sslSocketFactory);
 			} else {
 				sslContext = SSLContextBuilder.create().loadTrustMaterial(new TrustAllStrategy()).build();
-				SSLConnectionSocketFactory csf = new SSLConnectionSocketFactory(sslContext);
+				SSLConnectionSocketFactory csf = null;
+				if (testMode) {
+					csf = new SSLConnectionSocketFactory(sslContext, NoopHostnameVerifier.INSTANCE);
+				} else {
+					csf = new SSLConnectionSocketFactory(sslContext);
+				}
 				cmBuilder.setSSLSocketFactory(csf);
 			}
 		} catch (KeyManagementException | NoSuchAlgorithmException | KeyStoreException | CertificateException
diff --git a/src/main/java/com/eactive/eai/authoutbound/client/impl/HttpClientAccessTokenServiceWithParam.java b/src/main/java/com/eactive/eai/authoutbound/client/impl/HttpClientAccessTokenServiceWithParam.java
index 5eb9f07..d6dfb74 100644
--- a/src/main/java/com/eactive/eai/authoutbound/client/impl/HttpClientAccessTokenServiceWithParam.java
+++ b/src/main/java/com/eactive/eai/authoutbound/client/impl/HttpClientAccessTokenServiceWithParam.java
@@ -179,7 +179,12 @@ public class HttpClientAccessTokenServiceWithParam implements HttpClientAccessTo
 				cmBuilder.setSSLSocketFactory(sslSocketFactory);
 			} else {
 				sslContext = SSLContextBuilder.create().loadTrustMaterial(new TrustAllStrategy()).build();
-				SSLConnectionSocketFactory csf = new SSLConnectionSocketFactory(sslContext);
+				SSLConnectionSocketFactory csf = null;
+				if (testMode) {
+					csf = new SSLConnectionSocketFactory(sslContext, NoopHostnameVerifier.INSTANCE);
+				} else {
+					csf = new SSLConnectionSocketFactory(sslContext);
+				}
 				cmBuilder.setSSLSocketFactory(csf);
 			}
 		} catch (KeyManagementException | NoSuchAlgorithmException | KeyStoreException | CertificateException
diff --git a/src/main/java/com/eactive/eai/authoutbound/client/impl/HttpClientAccessTokenServiceWithParamAddBody.java b/src/main/java/com/eactive/eai/authoutbound/client/impl/HttpClientAccessTokenServiceWithParamAddBody.java
index af761af..504b58b 100644
--- a/src/main/java/com/eactive/eai/authoutbound/client/impl/HttpClientAccessTokenServiceWithParamAddBody.java
+++ b/src/main/java/com/eactive/eai/authoutbound/client/impl/HttpClientAccessTokenServiceWithParamAddBody.java
@@ -196,7 +196,12 @@ public class HttpClientAccessTokenServiceWithParamAddBody implements HttpClientA
 				cmBuilder.setSSLSocketFactory(sslSocketFactory);
 			} else {
 				sslContext = SSLContextBuilder.create().loadTrustMaterial(new TrustAllStrategy()).build();
-				SSLConnectionSocketFactory csf = new SSLConnectionSocketFactory(sslContext);
+				SSLConnectionSocketFactory csf = null;
+				if (testMode) {
+					csf = new SSLConnectionSocketFactory(sslContext, NoopHostnameVerifier.INSTANCE);
+				} else {
+					csf = new SSLConnectionSocketFactory(sslContext);
+				}
 				cmBuilder.setSSLSocketFactory(csf);
 			}
 		} catch (KeyManagementException | NoSuchAlgorithmException | KeyStoreException | CertificateException