diff --git a/gazelle-proxy-netty/src/test/java/net/ihe/gazelle/proxy/netty/App.java b/gazelle-proxy-netty/src/test/java/net/ihe/gazelle/proxy/netty/App.java
index 4eb227a8670cb15bb6feb455b74916f0a8d5722c..2e2d0e3acffe6bf2c03dcbdfff7485e1232339fa 100644
--- a/gazelle-proxy-netty/src/test/java/net/ihe/gazelle/proxy/netty/App.java
+++ b/gazelle-proxy-netty/src/test/java/net/ihe/gazelle/proxy/netty/App.java
@@ -67,12 +67,14 @@ public class App {
 	}
 
 	private static void startSyslogProxyTLS() {
-		// Syslog Client -TLS> Proxy1 -> Proxy Web app -> Proxy3 -TLS> Syslog
+		// Syslog Client 9443-TLS> Proxy1 10000-> Proxy Web app 8442-> Proxy3
+		// 8443-TLS> Syslog
 		// Server
 
 		// Starts a Syslog server (8443)
 		try {
-			AuthSSLSocketFactory serverSocketFactory = getSyslogServerSocketFactory();
+			AuthSSLSocketFactory serverSocketFactory = new AuthSSLSocketFactory(getKeyStoreServer(),
+					getKeyStoreClient());
 			org.openhealthtools.openatna.syslog.mina.tls.TlsConfig serverConfig = new org.openhealthtools.openatna.syslog.mina.tls.TlsConfig();
 			serverConfig.setSSLContext(serverSocketFactory.getSSLContext());
 			serverConfig.setHost("localhost");
@@ -87,20 +89,20 @@ public class App {
 
 		RawEventListenerSimple listener = new RawEventListenerSimple(System.out);
 
-		// Starts proxy3
-		InputStream clientKeyStoreStream = listener.getClass().getResourceAsStream("/keys/clientKeyStore");
-		TlsCredentials clientCredentials = new TlsCredentials(clientKeyStoreStream, "clientStorePass".toCharArray(),
-				"myClientCert", "password".toCharArray());
+		// Starts proxy3 (provider not TLS - 8442, connects to a TLS server - 8443)
+		InputStream clientKeyStoreStream = listener.getClass().getResourceAsStream("/keys/185.jks");
+		TlsCredentials clientCredentials = new TlsCredentials(clientKeyStoreStream, "password".toCharArray(), "tomcat",
+				"password".toCharArray());
 		TlsConfig tlsConfigClient = new TlsConfig(null, true, clientCredentials);
 		ConnectionConfig connectionConfigClient = new ConnectionConfigSimpleTls(8442, "127.0.0.1", 8443,
 				ChannelType.SYSLOG, tlsConfigClient);
 		RawProxy proxy3 = new RawProxy(listener, connectionConfigClient);
 		proxy3.start();
 
-		// Starts proxy2
-		InputStream serverKeyStoreStream = listener.getClass().getResourceAsStream("/keys/serverKeyStore");
-		TlsCredentials serverCredentials = new TlsCredentials(serverKeyStoreStream, "serverStorePass".toCharArray(),
-				"myServerCert", "password".toCharArray());
+		// Starts proxy1 (provider TLS - 9443, connects to a not TLS server - 10000)
+		InputStream serverKeyStoreStream = listener.getClass().getResourceAsStream("/keys/186.jks");
+		TlsCredentials serverCredentials = new TlsCredentials(serverKeyStoreStream, "password".toCharArray(), "tomcat",
+				"password".toCharArray());
 		TlsConfig tlsConfigServer = new TlsConfig(serverCredentials, false, null);
 		ConnectionConfig connectionConfigServer = new ConnectionConfigSimpleTls(9443, "127.0.0.1", 10000,
 				ChannelType.SYSLOG, tlsConfigServer);
@@ -109,8 +111,8 @@ public class App {
 
 		// Ping!
 		try {
-			AuthSSLSocketFactory clientSocketFactory = getSyslogClientSocketFactory();
-
+			AuthSSLSocketFactory clientSocketFactory = new AuthSSLSocketFactory(getKeyStoreClient(),
+					getKeyStoreServer());
 			ProtocolMessage sl = new ProtocolMessage(10, 5, "2009-08-14T14:12:23.115Z", "localhost",
 					new StringLogMessage("<atna></atna>"), "IHE_XDS", "ATNALOG", "1234");
 			List<SdParam> params = new ArrayList<SdParam>();
@@ -121,7 +123,8 @@ public class App {
 			StructuredElement se = new StructuredElement("exampleSDID@1234", params);
 			sl.addStructuredElement(se);
 
-			Socket s = clientSocketFactory.createSecureSocket("localhost", 9443);
+//			Socket s = clientSocketFactory.createSecureSocket("localhost", 8443);
+			Socket s = clientSocketFactory.createSecureSocket("jumbo.irisa.fr", 6514);
 			OutputStream out = s.getOutputStream();
 			byte[] bytes = sl.toByteArray();
 			for (int i = 0; i < 5; i++) {
@@ -140,22 +143,16 @@ public class App {
 
 	}
 
-	private static AuthSSLSocketFactory getSyslogServerSocketFactory() throws IOException {
-		URL u = Thread.currentThread().getContextClassLoader().getResource("keys/serverKeyStore");
-		KeystoreDetails key = new KeystoreDetails(u.toString(), "serverStorePass", "myServerCert", "password");
-		URL uu = Thread.currentThread().getContextClassLoader().getResource("keys/clientKeyStore");
-		KeystoreDetails trust = new KeystoreDetails(uu.toString(), "clientStorePass", "myClientCert");
-		AuthSSLSocketFactory f = new AuthSSLSocketFactory(key, trust);
-		return f;
+	private static KeystoreDetails getKeyStoreServer() {
+		URL u = Thread.currentThread().getContextClassLoader().getResource("keys/186.jks");
+		KeystoreDetails key = new KeystoreDetails(u.toString(), "password", "tomcat", "password");
+		return key;
 	}
 
-	private static AuthSSLSocketFactory getSyslogClientSocketFactory() throws IOException {
-		URL u = Thread.currentThread().getContextClassLoader().getResource("keys/serverKeyStore");
-		KeystoreDetails trust = new KeystoreDetails(u.toString(), "serverStorePass", "myServerCert");
-		URL uu = Thread.currentThread().getContextClassLoader().getResource("keys/clientKeyStore");
-		KeystoreDetails key = new KeystoreDetails(uu.toString(), "clientStorePass", "myClientCert", "password");
-		AuthSSLSocketFactory f = new AuthSSLSocketFactory(key, trust);
-		return f;
+	private static KeystoreDetails getKeyStoreClient() {
+		URL uu = Thread.currentThread().getContextClassLoader().getResource("keys/185.jks");
+		KeystoreDetails key = new KeystoreDetails(uu.toString(), "password", "tomcat", "password");
+		return key;
 	}
 
 	private static void startDicomProxyTLS(int port) {
diff --git a/gazelle-proxy-netty/src/test/resources/keys/185.jks b/gazelle-proxy-netty/src/test/resources/keys/185.jks
new file mode 100644
index 0000000000000000000000000000000000000000..482f714e2f0ca03b9d1e1d0f14ee15c1cedfbce2
Binary files /dev/null and b/gazelle-proxy-netty/src/test/resources/keys/185.jks differ
diff --git a/gazelle-proxy-netty/src/test/resources/keys/186.jks b/gazelle-proxy-netty/src/test/resources/keys/186.jks
new file mode 100644
index 0000000000000000000000000000000000000000..bc00bf5439435e176e95b2298d23ddbc89410f07
Binary files /dev/null and b/gazelle-proxy-netty/src/test/resources/keys/186.jks differ