diff --git a/core/src/main/java/com/google/net/stubby/util/ssl/InsecureTrustManager.java b/core/src/main/java/com/google/net/stubby/util/ssl/InsecureTrustManager.java
deleted file mode 100644
index 1fc45ca6dd..0000000000
--- a/core/src/main/java/com/google/net/stubby/util/ssl/InsecureTrustManager.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.google.net.stubby.util.ssl;
-
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-
-import javax.net.ssl.X509TrustManager;
-
-/**
- * This Trust Manager does absolutely no certificate verification.
- * It's meant to be used only by test code, and should never ever be
- * used in production code.
- *
- */
-public class InsecureTrustManager implements X509TrustManager {
-  /**
-   * @param chain The certificate chain we completely ignore and treat
-   * as valid.
-   * @param authType The type of certificate
-   * @throws CertificateException never, even if the certificate chain
-   * is invalid.
-   */
-  @Override
-  public void checkClientTrusted(X509Certificate[] chain, String authType)
-      throws CertificateException {
-    // Doing absolutely no checking of client certificate chain.
-  }
-
-  /**
-   * @param chain The certificate chain we completely ignore and treat
-   * as valid.
-   * @param authType The type of certificate
-   * @throws CertificateException never, even if the certificate chain
-   * is invalid.
-   */
-  @Override
-  public void checkServerTrusted(X509Certificate[] chain, String authType)
-      throws CertificateException {
-    // Doing absolutely no checking of server certificate chain.
-  }
-
-  /**
-   * @return null, always.
-   */
-  @Override
-  public X509Certificate[] getAcceptedIssuers() {
-    return null;
-  }
-}
diff --git a/core/src/main/java/com/google/net/stubby/util/ssl/SslContextFactory.java b/core/src/main/java/com/google/net/stubby/util/ssl/SslContextFactory.java
deleted file mode 100644
index 74b4e9f309..0000000000
--- a/core/src/main/java/com/google/net/stubby/util/ssl/SslContextFactory.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.google.net.stubby.util.ssl;
-
-import java.security.KeyStore;
-
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-
-/**
- * A helper class that hides the SSLContext config details for server and client.
- *
- * <p>
- * Currently it's mostly used to generate a client side SSL engine that blindly trusts any
- * certificates.
- * </p>
- *
- */
-public final class SslContextFactory {
-
-  private static final String PROTOCOL = "TLSv1";
-  private static final SSLContext CLIENT_CONTEXT;
-  private static final SSLContext SERVER_CONTEXT;
-
-  static {
-    SSLContext serverContext;
-    SSLContext clientContext;
-
-    try {
-      // Create a SSLContext that uses a pre-genrated key store.
-      KeyStore keyStore = KeyStore.getInstance("JKS");
-      keyStore.load(SslKeyStore.asInputStream(), SslKeyStore.getKeyStorePassword());
-
-      // Set up key manager factory to use our key store
-      String algorithm = System.getProperty("ssl.KeyManagerFactory.algorithm");
-      if (algorithm == null) {
-        algorithm = "SunX509";
-      }
-      KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(algorithm);
-      keyManagerFactory.init(keyStore, SslKeyStore.getCertificatePassword());
-
-      // Initialize the SSLContext to work with our key managers.
-      serverContext = SSLContext.getInstance(PROTOCOL);
-      serverContext.init(keyManagerFactory.getKeyManagers(), null, null);
-    } catch (Exception e) {
-      throw new Error(
-          "Failed to initialize the server-side SSLContext", e);
-    }
-
-    try {
-      // Create a client side SSLContext that trusts any certificate.
-      clientContext = SSLContext.getInstance(PROTOCOL);
-      clientContext.init(null, new TrustManager[]{new InsecureTrustManager()}, null);
-    } catch (Exception e) {
-      throw new Error(
-          "Failed to initialize the client-side SSLContext", e);
-    }
-
-    SERVER_CONTEXT = serverContext;
-    CLIENT_CONTEXT = clientContext;
-  }
-
-  public static SSLContext getServerContext() {
-    return SERVER_CONTEXT;
-  }
-
-  public static SSLContext getClientContext() {
-    return CLIENT_CONTEXT;
-  }
-
-  private SslContextFactory() {
-    // Unused
-  }
-}
diff --git a/core/src/main/java/com/google/net/stubby/util/ssl/SslKeyStore.java b/core/src/main/java/com/google/net/stubby/util/ssl/SslKeyStore.java
deleted file mode 100644
index a75c3484b7..0000000000
--- a/core/src/main/java/com/google/net/stubby/util/ssl/SslKeyStore.java
+++ /dev/null
@@ -1,298 +0,0 @@
-package com.google.net.stubby.util.ssl;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-
-/**
- * A bogus key store which provides all the required information to
- * create an example SSL connection.
- *
- * To generate a bogus key store:
- * <pre>
- * keytool  -genkey -alias bogus -keysize 2048 -validity 36500
- *          -keyalg RSA -dname "CN=securechat"
- *          -keypass secret -storepass secret
- *          -keystore cert.jks
- * </pre>
- */
-public final class SslKeyStore {
-  private static final short[] DATA = {
-    0xfe, 0xed, 0xfe, 0xed, 0x00, 0x00, 0x00, 0x02,
-    0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01,
-    0x00, 0x07, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c,
-    0x65, 0x00, 0x00, 0x01, 0x1a, 0x9f, 0x57, 0xa5,
-    0x27, 0x00, 0x00, 0x01, 0x9a, 0x30, 0x82, 0x01,
-    0x96, 0x30, 0x0e, 0x06, 0x0a, 0x2b, 0x06, 0x01,
-    0x04, 0x01, 0x2a, 0x02, 0x11, 0x01, 0x01, 0x05,
-    0x00, 0x04, 0x82, 0x01, 0x82, 0x48, 0x6d, 0xcf,
-    0x16, 0xb5, 0x50, 0x95, 0x36, 0xbf, 0x47, 0x27,
-    0x50, 0x58, 0x0d, 0xa2, 0x52, 0x7e, 0x25, 0xab,
-    0x14, 0x1a, 0x26, 0x5e, 0x2d, 0x8a, 0x23, 0x90,
-    0x60, 0x7f, 0x12, 0x20, 0x56, 0xd1, 0x43, 0xa2,
-    0x6b, 0x47, 0x5d, 0xed, 0x9d, 0xd4, 0xe5, 0x83,
-    0x28, 0x89, 0xc2, 0x16, 0x4c, 0x76, 0x06, 0xad,
-    0x8e, 0x8c, 0x29, 0x1a, 0x9b, 0x0f, 0xdd, 0x60,
-    0x4b, 0xb4, 0x62, 0x82, 0x9e, 0x4a, 0x63, 0x83,
-    0x2e, 0xd2, 0x43, 0x78, 0xc2, 0x32, 0x1f, 0x60,
-    0xa9, 0x8a, 0x7f, 0x0f, 0x7c, 0xa6, 0x1d, 0xe6,
-    0x92, 0x9e, 0x52, 0xc7, 0x7d, 0xbb, 0x35, 0x3b,
-    0xaa, 0x89, 0x73, 0x4c, 0xfb, 0x99, 0x54, 0x97,
-    0x99, 0x28, 0x6e, 0x66, 0x5b, 0xf7, 0x9b, 0x7e,
-    0x6d, 0x8a, 0x2f, 0xfa, 0xc3, 0x1e, 0x71, 0xb9,
-    0xbd, 0x8f, 0xc5, 0x63, 0x25, 0x31, 0x20, 0x02,
-    0xff, 0x02, 0xf0, 0xc9, 0x2c, 0xdd, 0x3a, 0x10,
-    0x30, 0xab, 0xe5, 0xad, 0x3d, 0x1a, 0x82, 0x77,
-    0x46, 0xed, 0x03, 0x38, 0xa4, 0x73, 0x6d, 0x36,
-    0x36, 0x33, 0x70, 0xb2, 0x63, 0x20, 0xca, 0x03,
-    0xbf, 0x5a, 0xf4, 0x7c, 0x35, 0xf0, 0x63, 0x1a,
-    0x12, 0x33, 0x12, 0x58, 0xd9, 0xa2, 0x63, 0x6b,
-    0x63, 0x82, 0x41, 0x65, 0x70, 0x37, 0x4b, 0x99,
-    0x04, 0x9f, 0xdd, 0x5e, 0x07, 0x01, 0x95, 0x9f,
-    0x36, 0xe8, 0xc3, 0x66, 0x2a, 0x21, 0x69, 0x68,
-    0x40, 0xe6, 0xbc, 0xbb, 0x85, 0x81, 0x21, 0x13,
-    0xe6, 0xa4, 0xcf, 0xd3, 0x67, 0xe3, 0xfd, 0x75,
-    0xf0, 0xdf, 0x83, 0xe0, 0xc5, 0x36, 0x09, 0xac,
-    0x1b, 0xd4, 0xf7, 0x2a, 0x23, 0x57, 0x1c, 0x5c,
-    0x0f, 0xf4, 0xcf, 0xa2, 0xcf, 0xf5, 0xbd, 0x9c,
-    0x69, 0x98, 0x78, 0x3a, 0x25, 0xe4, 0xfd, 0x85,
-    0x11, 0xcc, 0x7d, 0xef, 0xeb, 0x74, 0x60, 0xb1,
-    0xb7, 0xfb, 0x1f, 0x0e, 0x62, 0xff, 0xfe, 0x09,
-    0x0a, 0xc3, 0x80, 0x2f, 0x10, 0x49, 0x89, 0x78,
-    0xd2, 0x08, 0xfa, 0x89, 0x22, 0x45, 0x91, 0x21,
-    0xbc, 0x90, 0x3e, 0xad, 0xb3, 0x0a, 0xb4, 0x0e,
-    0x1c, 0xa1, 0x93, 0x92, 0xd8, 0x72, 0x07, 0x54,
-    0x60, 0xe7, 0x91, 0xfc, 0xd9, 0x3c, 0xe1, 0x6f,
-    0x08, 0xe4, 0x56, 0xf6, 0x0b, 0xb0, 0x3c, 0x39,
-    0x8a, 0x2d, 0x48, 0x44, 0x28, 0x13, 0xca, 0xe9,
-    0xf7, 0xa3, 0xb6, 0x8a, 0x5f, 0x31, 0xa9, 0x72,
-    0xf2, 0xde, 0x96, 0xf2, 0xb1, 0x53, 0xb1, 0x3e,
-    0x24, 0x57, 0xfd, 0x18, 0x45, 0x1f, 0xc5, 0x33,
-    0x1b, 0xa4, 0xe8, 0x21, 0xfa, 0x0e, 0xb2, 0xb9,
-    0xcb, 0xc7, 0x07, 0x41, 0xdd, 0x2f, 0xb6, 0x6a,
-    0x23, 0x18, 0xed, 0xc1, 0xef, 0xe2, 0x4b, 0xec,
-    0xc9, 0xba, 0xfb, 0x46, 0x43, 0x90, 0xd7, 0xb5,
-    0x68, 0x28, 0x31, 0x2b, 0x8d, 0xa8, 0x51, 0x63,
-    0xf7, 0x53, 0x99, 0x19, 0x68, 0x85, 0x66, 0x00,
-    0x00, 0x00, 0x01, 0x00, 0x05, 0x58, 0x2e, 0x35,
-    0x30, 0x39, 0x00, 0x00, 0x02, 0x3a, 0x30, 0x82,
-    0x02, 0x36, 0x30, 0x82, 0x01, 0xe0, 0xa0, 0x03,
-    0x02, 0x01, 0x02, 0x02, 0x04, 0x48, 0x59, 0xf1,
-    0x92, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48,
-    0x86, 0xf7, 0x0d, 0x01, 0x01, 0x05, 0x05, 0x00,
-    0x30, 0x81, 0xa0, 0x31, 0x0b, 0x30, 0x09, 0x06,
-    0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x4b, 0x52,
-    0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04,
-    0x08, 0x13, 0x0a, 0x4b, 0x79, 0x75, 0x6e, 0x67,
-    0x67, 0x69, 0x2d, 0x64, 0x6f, 0x31, 0x14, 0x30,
-    0x12, 0x06, 0x03, 0x55, 0x04, 0x07, 0x13, 0x0b,
-    0x53, 0x65, 0x6f, 0x6e, 0x67, 0x6e, 0x61, 0x6d,
-    0x2d, 0x73, 0x69, 0x31, 0x1a, 0x30, 0x18, 0x06,
-    0x03, 0x55, 0x04, 0x0a, 0x13, 0x11, 0x54, 0x68,
-    0x65, 0x20, 0x4e, 0x65, 0x74, 0x74, 0x79, 0x20,
-    0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x31,
-    0x18, 0x30, 0x16, 0x06, 0x03, 0x55, 0x04, 0x0b,
-    0x13, 0x0f, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c,
-    0x65, 0x20, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72,
-    0x73, 0x31, 0x30, 0x30, 0x2e, 0x06, 0x03, 0x55,
-    0x04, 0x03, 0x13, 0x27, 0x73, 0x65, 0x63, 0x75,
-    0x72, 0x65, 0x63, 0x68, 0x61, 0x74, 0x2e, 0x65,
-    0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x6e,
-    0x65, 0x74, 0x74, 0x79, 0x2e, 0x67, 0x6c, 0x65,
-    0x61, 0x6d, 0x79, 0x6e, 0x6f, 0x64, 0x65, 0x2e,
-    0x6e, 0x65, 0x74, 0x30, 0x20, 0x17, 0x0d, 0x30,
-    0x38, 0x30, 0x36, 0x31, 0x39, 0x30, 0x35, 0x34,
-    0x31, 0x33, 0x38, 0x5a, 0x18, 0x0f, 0x32, 0x31,
-    0x38, 0x37, 0x31, 0x31, 0x32, 0x34, 0x30, 0x35,
-    0x34, 0x31, 0x33, 0x38, 0x5a, 0x30, 0x81, 0xa0,
-    0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04,
-    0x06, 0x13, 0x02, 0x4b, 0x52, 0x31, 0x13, 0x30,
-    0x11, 0x06, 0x03, 0x55, 0x04, 0x08, 0x13, 0x0a,
-    0x4b, 0x79, 0x75, 0x6e, 0x67, 0x67, 0x69, 0x2d,
-    0x64, 0x6f, 0x31, 0x14, 0x30, 0x12, 0x06, 0x03,
-    0x55, 0x04, 0x07, 0x13, 0x0b, 0x53, 0x65, 0x6f,
-    0x6e, 0x67, 0x6e, 0x61, 0x6d, 0x2d, 0x73, 0x69,
-    0x31, 0x1a, 0x30, 0x18, 0x06, 0x03, 0x55, 0x04,
-    0x0a, 0x13, 0x11, 0x54, 0x68, 0x65, 0x20, 0x4e,
-    0x65, 0x74, 0x74, 0x79, 0x20, 0x50, 0x72, 0x6f,
-    0x6a, 0x65, 0x63, 0x74, 0x31, 0x18, 0x30, 0x16,
-    0x06, 0x03, 0x55, 0x04, 0x0b, 0x13, 0x0f, 0x45,
-    0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x20, 0x41,
-    0x75, 0x74, 0x68, 0x6f, 0x72, 0x73, 0x31, 0x30,
-    0x30, 0x2e, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13,
-    0x27, 0x73, 0x65, 0x63, 0x75, 0x72, 0x65, 0x63,
-    0x68, 0x61, 0x74, 0x2e, 0x65, 0x78, 0x61, 0x6d,
-    0x70, 0x6c, 0x65, 0x2e, 0x6e, 0x65, 0x74, 0x74,
-    0x79, 0x2e, 0x67, 0x6c, 0x65, 0x61, 0x6d, 0x79,
-    0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x6e, 0x65, 0x74,
-    0x30, 0x5c, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86,
-    0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05,
-    0x00, 0x03, 0x4b, 0x00, 0x30, 0x48, 0x02, 0x41,
-    0x00, 0xc3, 0xe3, 0x5e, 0x41, 0xa7, 0x87, 0x11,
-    0x00, 0x42, 0x2a, 0xb0, 0x4b, 0xed, 0xb2, 0xe0,
-    0x23, 0xdb, 0xb1, 0x3d, 0x58, 0x97, 0x35, 0x60,
-    0x0b, 0x82, 0x59, 0xd3, 0x00, 0xea, 0xd4, 0x61,
-    0xb8, 0x79, 0x3f, 0xb6, 0x3c, 0x12, 0x05, 0x93,
-    0x2e, 0x9a, 0x59, 0x68, 0x14, 0x77, 0x3a, 0xc8,
-    0x50, 0x25, 0x57, 0xa4, 0x49, 0x18, 0x63, 0x41,
-    0xf0, 0x2d, 0x28, 0xec, 0x06, 0xfb, 0xb4, 0x9f,
-    0xbf, 0x02, 0x03, 0x01, 0x00, 0x01, 0x30, 0x0d,
-    0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d,
-    0x01, 0x01, 0x05, 0x05, 0x00, 0x03, 0x41, 0x00,
-    0x65, 0x6c, 0x30, 0x01, 0xc2, 0x8e, 0x3e, 0xcb,
-    0xb3, 0x77, 0x48, 0xe9, 0x66, 0x61, 0x9a, 0x40,
-    0x86, 0xaf, 0xf6, 0x03, 0xeb, 0xba, 0x6a, 0xf2,
-    0xfd, 0xe2, 0xaf, 0x36, 0x5e, 0x7b, 0xaa, 0x22,
-    0x04, 0xdd, 0x2c, 0x20, 0xc4, 0xfc, 0xdd, 0xd0,
-    0x82, 0x20, 0x1c, 0x3d, 0xd7, 0x9e, 0x5e, 0x5c,
-    0x92, 0x5a, 0x76, 0x71, 0x28, 0xf5, 0x07, 0x7d,
-    0xa2, 0x81, 0xba, 0x77, 0x9f, 0x2a, 0xd9, 0x44,
-    0x00, 0x00, 0x00, 0x01, 0x00, 0x05, 0x6d, 0x79,
-    0x6b, 0x65, 0x79, 0x00, 0x00, 0x01, 0x1a, 0x9f,
-    0x5b, 0x56, 0xa0, 0x00, 0x00, 0x01, 0x99, 0x30,
-    0x82, 0x01, 0x95, 0x30, 0x0e, 0x06, 0x0a, 0x2b,
-    0x06, 0x01, 0x04, 0x01, 0x2a, 0x02, 0x11, 0x01,
-    0x01, 0x05, 0x00, 0x04, 0x82, 0x01, 0x81, 0x29,
-    0xa8, 0xb6, 0x08, 0x0c, 0x85, 0x75, 0x3e, 0xdd,
-    0xb5, 0xe5, 0x1a, 0x87, 0x68, 0xd1, 0x90, 0x4b,
-    0x29, 0x31, 0xee, 0x90, 0xbc, 0x9d, 0x73, 0xa0,
-    0x3f, 0xe9, 0x0b, 0xa4, 0xef, 0x30, 0x9b, 0x36,
-    0x9a, 0xb2, 0x54, 0x77, 0x81, 0x07, 0x4b, 0xaa,
-    0xa5, 0x77, 0x98, 0xe1, 0xeb, 0xb5, 0x7c, 0x4e,
-    0x48, 0xd5, 0x08, 0xfc, 0x2c, 0x36, 0xe2, 0x65,
-    0x03, 0xac, 0xe5, 0xf3, 0x96, 0xb7, 0xd0, 0xb5,
-    0x3b, 0x92, 0xe4, 0x14, 0x05, 0x7a, 0x6a, 0x92,
-    0x56, 0xfe, 0x4e, 0xab, 0xd3, 0x0e, 0x32, 0x04,
-    0x22, 0x22, 0x74, 0x47, 0x7d, 0xec, 0x21, 0x99,
-    0x30, 0x31, 0x64, 0x46, 0x64, 0x9b, 0xc7, 0x13,
-    0xbf, 0xbe, 0xd0, 0x31, 0x49, 0xe7, 0x3c, 0xbf,
-    0xba, 0xb1, 0x20, 0xf9, 0x42, 0xf4, 0xa9, 0xa9,
-    0xe5, 0x13, 0x65, 0x32, 0xbf, 0x7c, 0xcc, 0x91,
-    0xd3, 0xfd, 0x24, 0x47, 0x0b, 0xe5, 0x53, 0xad,
-    0x50, 0x30, 0x56, 0xd1, 0xfa, 0x9c, 0x37, 0xa8,
-    0xc1, 0xce, 0xf6, 0x0b, 0x18, 0xaa, 0x7c, 0xab,
-    0xbd, 0x1f, 0xdf, 0xe4, 0x80, 0xb8, 0xa7, 0xe0,
-    0xad, 0x7d, 0x50, 0x74, 0xf1, 0x98, 0x78, 0xbc,
-    0x58, 0xb9, 0xc2, 0x52, 0xbe, 0xd2, 0x5b, 0x81,
-    0x94, 0x83, 0x8f, 0xb9, 0x4c, 0xee, 0x01, 0x2b,
-    0x5e, 0xc9, 0x6e, 0x9b, 0xf5, 0x63, 0x69, 0xe4,
-    0xd8, 0x0b, 0x47, 0xd8, 0xfd, 0xd8, 0xe0, 0xed,
-    0xa8, 0x27, 0x03, 0x74, 0x1e, 0x5d, 0x32, 0xe6,
-    0x5c, 0x63, 0xc2, 0xfb, 0x3f, 0xee, 0xb4, 0x13,
-    0xc6, 0x0e, 0x6e, 0x74, 0xe0, 0x22, 0xac, 0xce,
-    0x79, 0xf9, 0x43, 0x68, 0xc1, 0x03, 0x74, 0x2b,
-    0xe1, 0x18, 0xf8, 0x7f, 0x76, 0x9a, 0xea, 0x82,
-    0x3f, 0xc2, 0xa6, 0xa7, 0x4c, 0xfe, 0xae, 0x29,
-    0x3b, 0xc1, 0x10, 0x7c, 0xd5, 0x77, 0x17, 0x79,
-    0x5f, 0xcb, 0xad, 0x1f, 0xd8, 0xa1, 0xfd, 0x90,
-    0xe1, 0x6b, 0xb2, 0xef, 0xb9, 0x41, 0x26, 0xa4,
-    0x0b, 0x4f, 0xc6, 0x83, 0x05, 0x6f, 0xf0, 0x64,
-    0x40, 0xe1, 0x44, 0xc4, 0xf9, 0x40, 0x2b, 0x3b,
-    0x40, 0xdb, 0xaf, 0x35, 0xa4, 0x9b, 0x9f, 0xc4,
-    0x74, 0x07, 0xe5, 0x18, 0x60, 0xc5, 0xfe, 0x15,
-    0x0e, 0x3a, 0x25, 0x2a, 0x11, 0xee, 0x78, 0x2f,
-    0xb8, 0xd1, 0x6e, 0x4e, 0x3c, 0x0a, 0xb5, 0xb9,
-    0x40, 0x86, 0x27, 0x6d, 0x8f, 0x53, 0xb7, 0x77,
-    0x36, 0xec, 0x5d, 0xed, 0x32, 0x40, 0x43, 0x82,
-    0xc3, 0x52, 0x58, 0xc4, 0x26, 0x39, 0xf3, 0xb3,
-    0xad, 0x58, 0xab, 0xb7, 0xf7, 0x8e, 0x0e, 0xba,
-    0x8e, 0x78, 0x9d, 0xbf, 0x58, 0x34, 0xbd, 0x77,
-    0x73, 0xa6, 0x50, 0x55, 0x00, 0x60, 0x26, 0xbf,
-    0x6d, 0xb4, 0x98, 0x8a, 0x18, 0x83, 0x89, 0xf8,
-    0xcd, 0x0d, 0x49, 0x06, 0xae, 0x51, 0x6e, 0xaf,
-    0xbd, 0xe2, 0x07, 0x13, 0xd8, 0x64, 0xcc, 0xbf,
-    0x00, 0x00, 0x00, 0x01, 0x00, 0x05, 0x58, 0x2e,
-    0x35, 0x30, 0x39, 0x00, 0x00, 0x02, 0x34, 0x30,
-    0x82, 0x02, 0x30, 0x30, 0x82, 0x01, 0xda, 0xa0,
-    0x03, 0x02, 0x01, 0x02, 0x02, 0x04, 0x48, 0x59,
-    0xf2, 0x84, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86,
-    0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x05, 0x05,
-    0x00, 0x30, 0x81, 0x9d, 0x31, 0x0b, 0x30, 0x09,
-    0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x4b,
-    0x52, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55,
-    0x04, 0x08, 0x13, 0x0a, 0x4b, 0x79, 0x75, 0x6e,
-    0x67, 0x67, 0x69, 0x2d, 0x64, 0x6f, 0x31, 0x14,
-    0x30, 0x12, 0x06, 0x03, 0x55, 0x04, 0x07, 0x13,
-    0x0b, 0x53, 0x65, 0x6f, 0x6e, 0x67, 0x6e, 0x61,
-    0x6d, 0x2d, 0x73, 0x69, 0x31, 0x1a, 0x30, 0x18,
-    0x06, 0x03, 0x55, 0x04, 0x0a, 0x13, 0x11, 0x54,
-    0x68, 0x65, 0x20, 0x4e, 0x65, 0x74, 0x74, 0x79,
-    0x20, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74,
-    0x31, 0x15, 0x30, 0x13, 0x06, 0x03, 0x55, 0x04,
-    0x0b, 0x13, 0x0c, 0x43, 0x6f, 0x6e, 0x74, 0x72,
-    0x69, 0x62, 0x75, 0x74, 0x6f, 0x72, 0x73, 0x31,
-    0x30, 0x30, 0x2e, 0x06, 0x03, 0x55, 0x04, 0x03,
-    0x13, 0x27, 0x73, 0x65, 0x63, 0x75, 0x72, 0x65,
-    0x63, 0x68, 0x61, 0x74, 0x2e, 0x65, 0x78, 0x61,
-    0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x6e, 0x65, 0x74,
-    0x74, 0x79, 0x2e, 0x67, 0x6c, 0x65, 0x61, 0x6d,
-    0x79, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x6e, 0x65,
-    0x74, 0x30, 0x20, 0x17, 0x0d, 0x30, 0x38, 0x30,
-    0x36, 0x31, 0x39, 0x30, 0x35, 0x34, 0x35, 0x34,
-    0x30, 0x5a, 0x18, 0x0f, 0x32, 0x31, 0x38, 0x37,
-    0x31, 0x31, 0x32, 0x33, 0x30, 0x35, 0x34, 0x35,
-    0x34, 0x30, 0x5a, 0x30, 0x81, 0x9d, 0x31, 0x0b,
-    0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13,
-    0x02, 0x4b, 0x52, 0x31, 0x13, 0x30, 0x11, 0x06,
-    0x03, 0x55, 0x04, 0x08, 0x13, 0x0a, 0x4b, 0x79,
-    0x75, 0x6e, 0x67, 0x67, 0x69, 0x2d, 0x64, 0x6f,
-    0x31, 0x14, 0x30, 0x12, 0x06, 0x03, 0x55, 0x04,
-    0x07, 0x13, 0x0b, 0x53, 0x65, 0x6f, 0x6e, 0x67,
-    0x6e, 0x61, 0x6d, 0x2d, 0x73, 0x69, 0x31, 0x1a,
-    0x30, 0x18, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x13,
-    0x11, 0x54, 0x68, 0x65, 0x20, 0x4e, 0x65, 0x74,
-    0x74, 0x79, 0x20, 0x50, 0x72, 0x6f, 0x6a, 0x65,
-    0x63, 0x74, 0x31, 0x15, 0x30, 0x13, 0x06, 0x03,
-    0x55, 0x04, 0x0b, 0x13, 0x0c, 0x43, 0x6f, 0x6e,
-    0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x6f, 0x72,
-    0x73, 0x31, 0x30, 0x30, 0x2e, 0x06, 0x03, 0x55,
-    0x04, 0x03, 0x13, 0x27, 0x73, 0x65, 0x63, 0x75,
-    0x72, 0x65, 0x63, 0x68, 0x61, 0x74, 0x2e, 0x65,
-    0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x6e,
-    0x65, 0x74, 0x74, 0x79, 0x2e, 0x67, 0x6c, 0x65,
-    0x61, 0x6d, 0x79, 0x6e, 0x6f, 0x64, 0x65, 0x2e,
-    0x6e, 0x65, 0x74, 0x30, 0x5c, 0x30, 0x0d, 0x06,
-    0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01,
-    0x01, 0x01, 0x05, 0x00, 0x03, 0x4b, 0x00, 0x30,
-    0x48, 0x02, 0x41, 0x00, 0x95, 0xb3, 0x47, 0x17,
-    0x95, 0x0f, 0x57, 0xcf, 0x66, 0x72, 0x0a, 0x7e,
-    0x5b, 0x54, 0xea, 0x8c, 0x6f, 0x79, 0xde, 0x94,
-    0xac, 0x0b, 0x5a, 0xd4, 0xd6, 0x1b, 0x58, 0x12,
-    0x1a, 0x16, 0x3d, 0xfe, 0xdf, 0xa5, 0x2b, 0x86,
-    0xbc, 0x64, 0xd4, 0x80, 0x1e, 0x3f, 0xf9, 0xe2,
-    0x04, 0x03, 0x79, 0x9b, 0xc1, 0x5c, 0xf0, 0xf1,
-    0xf3, 0xf1, 0xe3, 0xbf, 0x3f, 0xc0, 0x1f, 0xdd,
-    0xdb, 0xc0, 0x5b, 0x21, 0x02, 0x03, 0x01, 0x00,
-    0x01, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48,
-    0x86, 0xf7, 0x0d, 0x01, 0x01, 0x05, 0x05, 0x00,
-    0x03, 0x41, 0x00, 0x02, 0xd7, 0xdd, 0xbd, 0x0c,
-    0x8e, 0x21, 0x20, 0xef, 0x9e, 0x4f, 0x1f, 0xf5,
-    0x49, 0xf1, 0xae, 0x58, 0x9b, 0x94, 0x3a, 0x1f,
-    0x70, 0x33, 0xf0, 0x9b, 0xbb, 0xe9, 0xc0, 0xf3,
-    0x72, 0xcb, 0xde, 0xb6, 0x56, 0x72, 0xcc, 0x1c,
-    0xf0, 0xd6, 0x5a, 0x2a, 0xbc, 0xa1, 0x7e, 0x23,
-    0x83, 0xe9, 0xe7, 0xcf, 0x9e, 0xa5, 0xf9, 0xcc,
-    0xc2, 0x61, 0xf4, 0xdb, 0x40, 0x93, 0x1d, 0x63,
-    0x8a, 0x50, 0x4c, 0x11, 0x39, 0xb1, 0x91, 0xc1,
-    0xe6, 0x9d, 0xd9, 0x1a, 0x62, 0x1b, 0xb8, 0xd3,
-    0xd6, 0x9a, 0x6d, 0xb9, 0x8e, 0x15, 0x51 };
-
-  public static InputStream asInputStream() {
-    byte[] data = new byte[DATA.length];
-    for (int i = 0; i < data.length; i++) {
-      data[i] = (byte) DATA[i];
-    }
-    return new ByteArrayInputStream(data);
-  }
-
-  public static char[] getCertificatePassword() {
-    return "secret".toCharArray();
-  }
-
-  public static char[] getKeyStorePassword() {
-    return "secret".toCharArray();
-  }
-
-  private SslKeyStore() {
-    // Unused
-  }
-}
diff --git a/integration-testing/certs/README b/integration-testing/certs/README
new file mode 100644
index 0000000000..eb8482d648
--- /dev/null
+++ b/integration-testing/certs/README
@@ -0,0 +1,62 @@
+The test credentials (CONFIRMEDTESTKEY) have been generated with the following
+commands:
+
+Bad credentials (badclient.* / badserver.*):
+============================================
+
+These are self-signed certificates:
+
+$ openssl req -x509 -newkey rsa:1024 -keyout badserver.key -out badserver.pem \
+  -days 3650 -nodes
+
+When prompted for certificate information, everything is default except the
+common name which is set to badserver.test.google.com.
+
+
+Valid test credentials:
+=======================
+
+The ca is self-signed:
+----------------------
+
+$ openssl req -x509 -new -newkey rsa:1024 -nodes -out ca.pem -config ca-openssl.cnf -days 3650 -extensions v3_req
+When prompted for certificate information, everything is default.
+
+client is issued by CA:
+-----------------------
+
+$ openssl genrsa -out client.key.rsa 1024
+$ openssl pkcs8 -topk8 -in client.key.rsa -out client.key -nocrypt
+$ rm client.key.rsa
+$ openssl req -new -key client.key -out client.csr
+
+When prompted for certificate information, everything is default except the
+common name which is set to testclient.
+
+$ openssl ca -in client.csr -out client.pem
+
+server0 is issued by CA:
+------------------------
+
+$ openssl genrsa -out server0.key.rsa 1024
+$ openssl pkcs8 -topk8 -in server0.key.rsa -out server0.key -nocrypt
+$ rm server0.key.rsa
+$ openssl req -new -key server0.key -out server0.csr
+
+When prompted for certificate information, everything is default except the
+common name which is set to *.test.google.com.au.
+
+$ openssl ca -in server0.csr -out server0.pem
+
+server1 is issued by CA with a special config for subject alternative names:
+----------------------------------------------------------------------------
+
+$ openssl genrsa -out server1.key.rsa 1024
+$ openssl pkcs8 -topk8 -in server1.key.rsa -out server1.key -nocrypt
+$ rm server1.key.rsa
+$ openssl req -new -key server1.key -out server1.csr -config server1-openssl.cnf
+
+When prompted for certificate information, everything is default except the
+common name which is set to *.test.google.com.
+
+$ openssl ca -in server1.csr -out server1.pem
diff --git a/integration-testing/certs/badclient.key b/integration-testing/certs/badclient.key
new file mode 100644
index 0000000000..5832685122
--- /dev/null
+++ b/integration-testing/certs/badclient.key
@@ -0,0 +1,16 @@
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBALJfYnFn4nkj52WF
+E5W2qUxCfjsEFyuXYYKS/07UPWsv3gpZhtjXgdeGL+dpwEBC0IRDBfGnkMp6YY5S
+O7rnEz0X3r/fvgYy+dEl2jnaA6zgc7RzMGl9U11d56gP9FiDC2190mvP/hpq2xLZ
+CTbIximpmaoQyxuuH1bbYunesIG/AgMBAAECgYAdqJCEzMIyZE7oaW0tOpcB0BiP
+FYoIvH4BKRH8eHvR476mt+YdDhBP1scGUmYeCT4Ej+RgHv2LPTgVYwT9eciP2+E/
+CBCNRel0Sw9JepwW0r+jWJtDY1pp6YXAgNRGX2UflvUsT+o9lZvagf9moLTMyGvU
+uLFnsyfLim1B4vXvWQJBANouZllXGZoSrZLtR3VgV4tzRQvJxu84kLeIk64Ov47X
+pHVBMTRBfzPEhbBodjr1m5OLaVLqkFcXftzRCrbWoKsCQQDRSoLLXOiLrtJ3DLJC
+rX7Y8wrHZrqk5bMdZLGa/UX8RanhVw3+Xp+urd1711umeNJfzu/MCk4a1KkG/CU0
+rqs9AkA4cSx1DD1JSG+yxMNpsAS1xJomFIrsM9vsPt7FdndDwrF+y+CovhDkGYDk
+RAHh+svGfZg/pQK2JRPimAmHhzqFAkEAu6Ya70s2FUeB3Mu9aJs2CD6hg3dQEVkB
+53DI7TX48d9kGW58VX1xnqS02LyWqAPcW5qm1kLHFLdndaPNmBaj4QJBAJugl367
+9d9t/QLTSuULLaoYv2vJT3s1y9HN89EoaDDEkPVfQu6GVEXgIBtim1sI/VPSzI8H
+aXvaTUwblFWSM70=
+-----END PRIVATE KEY-----
diff --git a/integration-testing/certs/badclient.pem b/integration-testing/certs/badclient.pem
new file mode 100644
index 0000000000..1785970221
--- /dev/null
+++ b/integration-testing/certs/badclient.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIICoDCCAgmgAwIBAgIJANIz2/zoRiapMA0GCSqGSIb3DQEBBQUAMGkxCzAJBgNV
+BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
+aWRnaXRzIFB0eSBMdGQxIjAgBgNVBAMMGWJhZGNsaWVudC50ZXN0Lmdvb2dsZS5j
+b20wHhcNMTQwNzI4MjAwODI1WhcNMjQwNzI1MjAwODI1WjBpMQswCQYDVQQGEwJB
+VTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0
+cyBQdHkgTHRkMSIwIAYDVQQDDBliYWRjbGllbnQudGVzdC5nb29nbGUuY29tMIGf
+MA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCyX2JxZ+J5I+dlhROVtqlMQn47BBcr
+l2GCkv9O1D1rL94KWYbY14HXhi/nacBAQtCEQwXxp5DKemGOUju65xM9F96/374G
+MvnRJdo52gOs4HO0czBpfVNdXeeoD/RYgwttfdJrz/4aatsS2Qk2yMYpqZmqEMsb
+rh9W22Lp3rCBvwIDAQABo1AwTjAdBgNVHQ4EFgQU523AJMR8Ds9V8fhf7gu1i0MM
+UqAwHwYDVR0jBBgwFoAU523AJMR8Ds9V8fhf7gu1i0MMUqAwDAYDVR0TBAUwAwEB
+/zANBgkqhkiG9w0BAQUFAAOBgQCI/tvSBYH1iyfLaCTBKwpdj36+MkR9EeJJmImx
+X+bjhKWXwsBX4PDMWvdusr++QGUYtyoya+hfYMXRhXua39mD54xgloQNuu9REDwX
+Ffto+aOw3BcYducz6ofxicFK/Y2VeXDurSMpRv5TfGf2Qr6eOOdaRhj6ed7BibHk
+X1VGZA==
+-----END CERTIFICATE-----
diff --git a/integration-testing/certs/badserver.key b/integration-testing/certs/badserver.key
new file mode 100644
index 0000000000..abfbde10ff
--- /dev/null
+++ b/integration-testing/certs/badserver.key
@@ -0,0 +1,16 @@
+-----BEGIN PRIVATE KEY-----
+MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKeZ1e1y29cmBKaW
+oIUwJ5neOJUjx+eD/3nRPe+dvLXEd9+db0fG5RYRR0S3mF1Ywuj4PIxlTW2YprUS
+oGSw+tcqWNIzxv94HjwYFkkvER3AblXcDBh0P2zAkzg+nf9AcAsMh0QpDTyrXtMl
+gqryjq1/vkhFofKMMbY+aXJdG6OBAgMBAAECgYAAgaB51S0A22aMMkxN2rVj6530
+JWWHN4jgD1fGj41wZyWNkWYyq1Ep3ed/N6bIMWp1VbqpGe0/9YQba/D8HOTFHGRt
+72YXnP1e/ds8cxU4x4j1vvqSPtXpMmkiXfXijOvCl9mrMH2xjghFAt6/1Nb9xo1m
+VdcOB8OdSuOIw6CI+QJBAN5FZUbS+bRXDWII/FaAih1DBpwCxhYEN+TXPJBxSen6
+kOzGt5g+mB6YqRMZ/qshshwPq7bsgFGfJ2lIdS2t3GsCQQDBCKifV5AAkOdOUrkK
+HvoX3qnVmyIA8CyvWLcIWpfZ76QAYh0q0StedKdOMXaB1jTeSJ2KU1nlss7UD1Yw
+VbrDAkAwjMHpbW3jiVw//Kx5jIwehiRscWKpLnSzBJyTBFvbwsJjJai2lX2OuVO8
++2GYKb0Iyhd81j3VFkl6grwtpRtPAkB7+n+yt555fpfRKjhGU9b09cHGu7h/OcK5
+bBVCfE0DYHLI/DsXgPiF1g6Onh4rDdUu3xyv9xDKAqnscV099hHZAkEAvcFBfXZs
+tk18N+bUcvXTdZjzZbfLCHlJmwPIspZ8G/6Pn63deg4GVYoCvTwGruah+8y734Ph
+7PskfPgUQlB7Ag==
+-----END PRIVATE KEY-----
diff --git a/integration-testing/certs/badserver.pem b/integration-testing/certs/badserver.pem
new file mode 100644
index 0000000000..983c979f31
--- /dev/null
+++ b/integration-testing/certs/badserver.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIICoDCCAgmgAwIBAgIJAPdqwqsKNy81MA0GCSqGSIb3DQEBBQUAMGkxCzAJBgNV
+BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
+aWRnaXRzIFB0eSBMdGQxIjAgBgNVBAMMGWJhZHNlcnZlci50ZXN0Lmdvb2dsZS5j
+b20wHhcNMTQwNzI4MjAwODU0WhcNMjQwNzI1MjAwODU0WjBpMQswCQYDVQQGEwJB
+VTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0
+cyBQdHkgTHRkMSIwIAYDVQQDDBliYWRzZXJ2ZXIudGVzdC5nb29nbGUuY29tMIGf
+MA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCnmdXtctvXJgSmlqCFMCeZ3jiVI8fn
+g/950T3vnby1xHffnW9HxuUWEUdEt5hdWMLo+DyMZU1tmKa1EqBksPrXKljSM8b/
+eB48GBZJLxEdwG5V3AwYdD9swJM4Pp3/QHALDIdEKQ08q17TJYKq8o6tf75IRaHy
+jDG2PmlyXRujgQIDAQABo1AwTjAdBgNVHQ4EFgQU3u/qvHr9knMBeZyAD7mAA/ec
+8cUwHwYDVR0jBBgwFoAU3u/qvHr9knMBeZyAD7mAA/ec8cUwDAYDVR0TBAUwAwEB
+/zANBgkqhkiG9w0BAQUFAAOBgQA/FmR1SGLguxCCfhp4CYCbrAePSyPWDi48gTwj
+vVZf/OMxdVu/H8sBYFf27BjbrEugAw16DElFtgTZ83pLb2BvkUgb6vBUK5sEkgmh
+z88zBsgDp8aCf4STDOLFZMBh/E9ZKkm1zogbEmlTjFp/ceSpa2gNv7OuN4WiorOh
+Wvw40g==
+-----END CERTIFICATE-----
diff --git a/integration-testing/certs/ca-openssl.cnf b/integration-testing/certs/ca-openssl.cnf
new file mode 100644
index 0000000000..e97b945e4b
--- /dev/null
+++ b/integration-testing/certs/ca-openssl.cnf
@@ -0,0 +1,17 @@
+[req]
+distinguished_name  = req_distinguished_name
+req_extensions = v3_req
+
+[req_distinguished_name]
+countryName           = Country Name (2 letter code)
+countryName_default = AU
+stateOrProvinceName   = State or Province Name (full name)
+stateOrProvinceName_default = Some-State
+organizationName          = Organization Name (eg, company)
+organizationName_default = Internet Widgits Pty Ltd
+commonName            = Common Name (eg, YOUR name)
+commonName_default = testca
+
+[v3_req]
+basicConstraints = CA:true
+keyUsage = critical, keyCertSign
diff --git a/integration-testing/certs/ca.key b/integration-testing/certs/ca.key
new file mode 100644
index 0000000000..03c4f950e3
--- /dev/null
+++ b/integration-testing/certs/ca.key
@@ -0,0 +1,16 @@
+-----BEGIN PRIVATE KEY-----
+MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAMBA3wVeTGHZR1Ry
+e/i+J8a2cu5gXwFV6TnObzGM7bLFCO5i9v4mLo4iFzPsHmWDUxKS3Y8iXbu0eYBl
+LoNY0lSvxDx33O+DuwMmVN+DzSD+Eod9zfvwOWHsazYCZT2PhNxnVWIuJXViY4JA
+HUGodjx+QAi6yCAurUZGvYXGgZSBAgMBAAECgYAxRi8i9BlFlufGSBVoGmydbJOm
+bwLKl9dP3o33ODSP9hok5y6A0w5plWk3AJSF1hPLleK9VcSKYGYnt0clmPVHF35g
+bx2rVK8dOT0mn7rz9Zr70jcSz1ETA2QonHZ+Y+niLmcic9At6hRtWiewblUmyFQm
+GwggIzi7LOyEUHrEcQJBAOXxyQvnLvtKzXiqcsW/K6rExqVJVk+KF0fzzVyMzTJx
+HRBxUVgvGdEJT7j+7P2kcTyafve0BBzDSPIaDyiJ+Y0CQQDWCb7jASFSbu5M3Zcd
+Gkr4ZKN1XO3VLQX10b22bQYdF45hrTN2tnzRvVUR4q86VVnXmiGiTqmLkXcA2WWf
+pHfFAkAhv9olUBo6MeF0i3frBEMRfm41hk0PwZHnMqZ6pgPcGnQMnMU2rzsXzkkQ
+OwJnvAIOxhJKovZTjmofdqmw5odlAkBYVUdRWjsNUTjJwj3GRf6gyq/nFMYWz3EB
+RWFdM1ttkDYzu45ctO2IhfHg4sPceDMO1s6AtKQmNI9/azkUjITdAkApNa9yFRzc
+TBaDNPd5KVd58LVIzoPQ6i7uMHteLXJUWqSroji6S3s4gKMFJ/dO+ZXIlgQgfJJJ
+ZDL4cdrdkeoM
+-----END PRIVATE KEY-----
diff --git a/integration-testing/certs/ca.pem b/integration-testing/certs/ca.pem
new file mode 100644
index 0000000000..6c8511a73c
--- /dev/null
+++ b/integration-testing/certs/ca.pem
@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE-----
+MIICSjCCAbOgAwIBAgIJAJHGGR4dGioHMA0GCSqGSIb3DQEBCwUAMFYxCzAJBgNV
+BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
+aWRnaXRzIFB0eSBMdGQxDzANBgNVBAMTBnRlc3RjYTAeFw0xNDExMTEyMjMxMjla
+Fw0yNDExMDgyMjMxMjlaMFYxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0
+YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxDzANBgNVBAMT
+BnRlc3RjYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwEDfBV5MYdlHVHJ7
++L4nxrZy7mBfAVXpOc5vMYztssUI7mL2/iYujiIXM+weZYNTEpLdjyJdu7R5gGUu
+g1jSVK/EPHfc74O7AyZU34PNIP4Sh33N+/A5YexrNgJlPY+E3GdVYi4ldWJjgkAd
+Qah2PH5ACLrIIC6tRka9hcaBlIECAwEAAaMgMB4wDAYDVR0TBAUwAwEB/zAOBgNV
+HQ8BAf8EBAMCAgQwDQYJKoZIhvcNAQELBQADgYEAHzC7jdYlzAVmddi/gdAeKPau
+sPBG/C2HCWqHzpCUHcKuvMzDVkY/MP2o6JIW2DBbY64bO/FceExhjcykgaYtCH/m
+oIU63+CFOTtR7otyQAWHqXa7q4SbCDlG7DyRFxqG0txPtGvy12lgldA2+RgcigQG
+Dfcog5wrJytaQ6UA0wE=
+-----END CERTIFICATE-----
diff --git a/integration-testing/certs/client.key b/integration-testing/certs/client.key
new file mode 100644
index 0000000000..f48d0735d9
--- /dev/null
+++ b/integration-testing/certs/client.key
@@ -0,0 +1,16 @@
+-----BEGIN PRIVATE KEY-----
+MIICeQIBADANBgkqhkiG9w0BAQEFAASCAmMwggJfAgEAAoGBAOxUR9uhvhbeVUIM
+s5WbH0px0mehl2+6sZpNjzvE2KimZpHzMJHukVH0Ffkvhs0b8+S5Ut9VNUAqd3IM
+JCCAEGtRNoQhM1t9Yr2zAckSvbRacp+FL/Cj9eDmyo00KsVGaeefA4Dh4OW+ZhkT
+NKcldXqkSuj1sEf244JZYuqZp6/tAgMBAAECgYEAi2NSVqpZMafE5YYUTcMGe6QS
+k2jtpsqYgggI2RnLJ/2tNZwYI5pwP8QVSbnMaiF4gokD5hGdrNDfTnb2v+yIwYEH
+0w8+oG7Z81KodsiZSIDJfTGsAZhVNwOz9y0VD8BBZZ1/274Zh52AUKLjZS/ZwIbS
+W2ywya855dPnH/wj+0ECQQD9X8D920kByTNHhBG18biAEZ4pxs9f0OAG8333eVcI
+w2lJDLsYDZrCB2ocgA3lUdozlzPC7YDYw8reg0tkiRY5AkEA7sdNzOeQsQRn7++5
+0bP9DtT/iON1gbfxRzCfCfXdoOtfQWIzTePWtURt9X/5D9NofI0Rg5W2oGy/MLe5
+/sXHVQJBAIup5XrJDkQywNZyAUU2ecn2bCWBFjwtqd+LBmuMciI9fOKsZtEKZrz/
+U0lkeMRoSwvXE8wmGLjjrAbdfohrXFkCQQDZEx/LtIl6JINJQiswVe0tWr6k+ASP
+1WXoTm+HYpoF/XUvv9LccNF1IazFj34hwRQwhx7w/V52Ieb+p0jUMYGxAkEAjDhd
+9pBO1fKXWiXzi9ZKfoyTNcUq3eBSVKwPG2nItg5ycXengjT5sgcWDnciIzW7BIVI
+JiqOszq9GWESErAatg==
+-----END PRIVATE KEY-----
diff --git a/integration-testing/certs/client.pem b/integration-testing/certs/client.pem
new file mode 100644
index 0000000000..e332091019
--- /dev/null
+++ b/integration-testing/certs/client.pem
@@ -0,0 +1,14 @@
+-----BEGIN CERTIFICATE-----
+MIICHzCCAYgCAQEwDQYJKoZIhvcNAQEFBQAwVjELMAkGA1UEBhMCQVUxEzARBgNV
+BAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0
+ZDEPMA0GA1UEAwwGdGVzdGNhMB4XDTE0MDcxNzIzNTYwMloXDTI0MDcxNDIzNTYw
+MlowWjELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDETMBEGA1UEAwwKdGVzdGNsaWVudDCB
+nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA7FRH26G+Ft5VQgyzlZsfSnHSZ6GX
+b7qxmk2PO8TYqKZmkfMwke6RUfQV+S+GzRvz5LlS31U1QCp3cgwkIIAQa1E2hCEz
+W31ivbMByRK9tFpyn4Uv8KP14ObKjTQqxUZp558DgOHg5b5mGRM0pyV1eqRK6PWw
+R/bjglli6pmnr+0CAwEAATANBgkqhkiG9w0BAQUFAAOBgQAStSm5PM7ubROiKK6/
+T2FkKlhiTOx+Ryenm3Eio59emq+jXl+1nhPySX5G2PQzSR5vd1dIhwgZSR4Gyttk
+tRZ57k/NI1brUW8joiEOMJA/Mr7H7asx7wIRYDE91Fs8GkKWd5LhoPAQj+qdG35C
+OO+svdkmqH0KZo320ZUqdl2ooQ==
+-----END CERTIFICATE-----
diff --git a/integration-testing/certs/server0.key b/integration-testing/certs/server0.key
new file mode 100644
index 0000000000..add153c9ae
--- /dev/null
+++ b/integration-testing/certs/server0.key
@@ -0,0 +1,16 @@
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBANOmffupIGC8YDau
+rOF4eKnHwPszgpkkhWzKsVxhNDBxCVYx4TEjG0XWIO0iyRXupZbUC+7N/8HnEVNa
+8F1jYhng14Iiq99cNQbbnuHHhIztmpocrJTxmnhGzoAnRa1Tb+GnAuRoIHRA/V2c
+VUE9tbikQugFx/SPgXAw6tfWB+YvAgMBAAECgYEAoEq9qzUBgoHoVEGiSPiWWe8g
+5p6yUA1qx2QTQyWTAwT4z0DjjfVKmG99bFsl8+hTnJFnoCp/gnjflEOROwkjp5kG
+m0drqOPx1jeipJjpXYTBu49h+WpZ1PF+KhVtxsIm3OOCvh67iWaKyyOVb5Og8aiR
+jl6dn/TdG/dlGD8AfUECQQDuNMle6p0oU8amC6O9wIMBroxx2nFstzE6O35PLEzG
+/tj0kxxn9Jp2TS9mGaLCzSuXmpjlF4+NOWiBPkrLC2TfAkEA43Xg7uEUkaJAz2/W
+m1lIBTLt+4rIQY/2emh33bDcA+rv8rwwrMMIv17/xPx7bs49YqGG5xufD+Rwl6TL
+qFXYsQJAPrOwagax1aKvwJeBw3oAQhoTKAkLIEXcdGqipe6QSzVcIIz0xjxxyEAr
+AOIwoLxnBCISqwMXq2H4K0UdZPMb2wJAdhdYLY1L6YRMk6XjzImg25oidisKZweA
+FvMv8DgHMj2CUAqmVrt3SivfLH1M9C09L3zfFhOAFHcsgX58gav4MQJBANSBnrHj
+tIq4l8z79CPUIuu3QyeEh+XwY8s5qE5CNTck0U59lzp9NvENHbkx3KO896TTerko
++8bXHMLkJkHPXms=
+-----END PRIVATE KEY-----
diff --git a/integration-testing/certs/server0.pem b/integration-testing/certs/server0.pem
new file mode 100644
index 0000000000..ade75d8563
--- /dev/null
+++ b/integration-testing/certs/server0.pem
@@ -0,0 +1,14 @@
+-----BEGIN CERTIFICATE-----
+MIICHDCCAYUCAQQwDQYJKoZIhvcNAQEFBQAwVjELMAkGA1UEBhMCQVUxEzARBgNV
+BAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0
+ZDEPMA0GA1UEAwwGdGVzdGNhMB4XDTE0MDcyMjE3NTk0OVoXDTI0MDcxOTE3NTk0
+OVowVzELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxFDASBgNVBAoM
+C0dvb2dsZSBJbmMuMR0wGwYDVQQDDBQqLnRlc3QuZ29vZ2xlLmNvbS5hdTCBnzAN
+BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA06Z9+6kgYLxgNq6s4Xh4qcfA+zOCmSSF
+bMqxXGE0MHEJVjHhMSMbRdYg7SLJFe6lltQL7s3/wecRU1rwXWNiGeDXgiKr31w1
+Btue4ceEjO2amhyslPGaeEbOgCdFrVNv4acC5GggdED9XZxVQT21uKRC6AXH9I+B
+cDDq19YH5i8CAwEAATANBgkqhkiG9w0BAQUFAAOBgQBtfR5qXG9TTI8YcYh7sA4V
+GeNoplp0x6p7OG0NLvbJqAkUnkvjIkk1m1R2AUHhbkxzx6G75JIOoNJcWrCzywBA
+BIsaTdmnNysf/s1hQJuD3IHiVb+7Ji0jhttnJlYcMid4o0tJO/a2E9YUxR+9cg0i
+obb+Ql3qsvKdWBC1dDLDLw==
+-----END CERTIFICATE-----
diff --git a/integration-testing/certs/server1-openssl.cnf b/integration-testing/certs/server1-openssl.cnf
new file mode 100644
index 0000000000..8a02108289
--- /dev/null
+++ b/integration-testing/certs/server1-openssl.cnf
@@ -0,0 +1,26 @@
+[req]
+distinguished_name  = req_distinguished_name
+req_extensions     = v3_req
+
+[req_distinguished_name]
+countryName           = Country Name (2 letter code)
+countryName_default   = US
+stateOrProvinceName   = State or Province Name (full name)
+stateOrProvinceName_default = Illinois
+localityName          = Locality Name (eg, city)
+localityName_default  = Chicago
+organizationName          = Organization Name (eg, company)
+organizationName_default  = Example, Co.
+commonName            = Common Name (eg, YOUR name)
+commonName_max        = 64
+
+[v3_req]
+basicConstraints = CA:FALSE
+keyUsage = nonRepudiation, digitalSignature, keyEncipherment
+subjectAltName = @alt_names
+
+[alt_names]
+DNS.1 = *.test.google.fr
+DNS.2 = waterzooi.test.google.be
+DNS.3 = *.test.youtube.com
+IP.1 = "192.168.1.3"
diff --git a/integration-testing/certs/server1.key b/integration-testing/certs/server1.key
new file mode 100644
index 0000000000..143a5b8765
--- /dev/null
+++ b/integration-testing/certs/server1.key
@@ -0,0 +1,16 @@
+-----BEGIN PRIVATE KEY-----
+MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAOHDFScoLCVJpYDD
+M4HYtIdV6Ake/sMNaaKdODjDMsux/4tDydlumN+fm+AjPEK5GHhGn1BgzkWF+slf
+3BxhrA/8dNsnunstVA7ZBgA/5qQxMfGAq4wHNVX77fBZOgp9VlSMVfyd9N8YwbBY
+AckOeUQadTi2X1S6OgJXgQ0m3MWhAgMBAAECgYAn7qGnM2vbjJNBm0VZCkOkTIWm
+V10okw7EPJrdL2mkre9NasghNXbE1y5zDshx5Nt3KsazKOxTT8d0Jwh/3KbaN+YY
+tTCbKGW0pXDRBhwUHRcuRzScjli8Rih5UOCiZkhefUTcRb6xIhZJuQy71tjaSy0p
+dHZRmYyBYO2YEQ8xoQJBAPrJPhMBkzmEYFtyIEqAxQ/o/A6E+E4w8i+KM7nQCK7q
+K4JXzyXVAjLfyBZWHGM2uro/fjqPggGD6QH1qXCkI4MCQQDmdKeb2TrKRh5BY1LR
+81aJGKcJ2XbcDu6wMZK4oqWbTX2KiYn9GB0woM6nSr/Y6iy1u145YzYxEV/iMwff
+DJULAkB8B2MnyzOg0pNFJqBJuH29bKCcHa8gHJzqXhNO5lAlEbMK95p/P2Wi+4Hd
+aiEIAF1BF326QJcvYKmwSmrORp85AkAlSNxRJ50OWrfMZnBgzVjDx3xG6KsFQVk2
+ol6VhqL6dFgKUORFUWBvnKSyhjJxurlPEahV6oo6+A+mPhFY8eUvAkAZQyTdupP3
+XEFQKctGz+9+gKkemDp7LBBMEMBXrGTLPhpEfcjv/7KPdnFHYmhYeBTBnuVmTVWe
+F98XJ7tIFfJq
+-----END PRIVATE KEY-----
diff --git a/integration-testing/certs/server1.pem b/integration-testing/certs/server1.pem
new file mode 100644
index 0000000000..8e582e571f
--- /dev/null
+++ b/integration-testing/certs/server1.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE-----
+MIICmzCCAgSgAwIBAgIBAzANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJBVTET
+MBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQ
+dHkgTHRkMQ8wDQYDVQQDDAZ0ZXN0Y2EwHhcNMTQwNzIyMDYwMDU3WhcNMjQwNzE5
+MDYwMDU3WjBkMQswCQYDVQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNV
+BAcTB0NoaWNhZ28xFDASBgNVBAoTC0dvb2dsZSBJbmMuMRowGAYDVQQDFBEqLnRl
+c3QuZ29vZ2xlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA4cMVJygs
+JUmlgMMzgdi0h1XoCR7+ww1pop04OMMyy7H/i0PJ2W6Y35+b4CM8QrkYeEafUGDO
+RYX6yV/cHGGsD/x02ye6ey1UDtkGAD/mpDEx8YCrjAc1Vfvt8Fk6Cn1WVIxV/J30
+3xjBsFgByQ55RBp1OLZfVLo6AleBDSbcxaECAwEAAaNrMGkwCQYDVR0TBAIwADAL
+BgNVHQ8EBAMCBeAwTwYDVR0RBEgwRoIQKi50ZXN0Lmdvb2dsZS5mcoIYd2F0ZXJ6
+b29pLnRlc3QuZ29vZ2xlLmJlghIqLnRlc3QueW91dHViZS5jb22HBMCoAQMwDQYJ
+KoZIhvcNAQEFBQADgYEAM2Ii0LgTGbJ1j4oqX9bxVcxm+/R5Yf8oi0aZqTJlnLYS
+wXcBykxTx181s7WyfJ49WwrYXo78zTDAnf1ma0fPq3e4mpspvyndLh1a+OarHa1e
+aT0DIIYk7qeEa1YcVljx2KyLd0r1BBAfrwyGaEPVeJQVYWaOJRU2we/KD4ojf9s=
+-----END CERTIFICATE-----
diff --git a/integration-testing/src/main/java/com/google/net/stubby/testing/integration/TestServiceClient.java b/integration-testing/src/main/java/com/google/net/stubby/testing/integration/TestServiceClient.java
index d105fff104..0b7c92ff56 100644
--- a/integration-testing/src/main/java/com/google/net/stubby/testing/integration/TestServiceClient.java
+++ b/integration-testing/src/main/java/com/google/net/stubby/testing/integration/TestServiceClient.java
@@ -7,8 +7,16 @@ import com.google.net.stubby.transport.netty.NegotiationType;
 import com.google.net.stubby.transport.netty.NettyChannelBuilder;
 import com.google.net.stubby.transport.okhttp.OkHttpChannelBuilder;
 
+import io.netty.handler.ssl.SslContext;
+
+import java.io.File;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.UnknownHostException;
 import java.util.Map;
 
+import javax.net.ssl.SSLException;
+
 /**
  * Application that starts a client for the {@link TestServiceGrpc.TestService} and runs through a
  * series of tests.
@@ -31,8 +39,26 @@ public class TestServiceClient {
     NETTY_TLS {
       @Override
       public ChannelImpl createChannel(String serverHost, int serverPort) {
-        return NettyChannelBuilder.forAddress(serverHost, serverPort)
-            .negotiationType(NegotiationType.TLS).build();
+        InetAddress address;
+        try {
+          address = InetAddress.getByName(serverHost);
+          // Force the hostname to match the cert the server uses.
+          address = InetAddress.getByAddress("foo.test.google.fr", address.getAddress());
+        } catch (UnknownHostException ex) {
+          throw new RuntimeException(ex);
+        }
+        SslContext sslContext;
+        try {
+          String dir = "integration-testing/certs";
+          sslContext = SslContext.newClientContext(
+              new File(dir + "/ca.pem"));
+        } catch (SSLException ex) {
+          throw new RuntimeException(ex);
+        }
+        return NettyChannelBuilder.forAddress(new InetSocketAddress(address, serverPort))
+            .negotiationType(NegotiationType.TLS)
+            .sslContext(sslContext)
+            .build();
       }
     },
     OKHTTP {
@@ -65,7 +91,7 @@ public class TestServiceClient {
     String testCase = getTestCase(argMap);
 
     com.google.net.stubby.transport.AbstractStream.GRPC_V2_PROTOCOL =
-        getGrpcVersion(argMap) == 2; 
+        getGrpcVersion(argMap) == 2;
 
     final Tester tester = new Tester(transport, serverHost, serverPort);
     Runtime.getRuntime().addShutdownHook(new Thread() {
diff --git a/integration-testing/src/main/java/com/google/net/stubby/testing/integration/TestServiceServer.java b/integration-testing/src/main/java/com/google/net/stubby/testing/integration/TestServiceServer.java
index ed9183e777..28ab84d36f 100644
--- a/integration-testing/src/main/java/com/google/net/stubby/testing/integration/TestServiceServer.java
+++ b/integration-testing/src/main/java/com/google/net/stubby/testing/integration/TestServiceServer.java
@@ -9,8 +9,8 @@ import com.google.net.stubby.testing.TestUtils;
 import com.google.net.stubby.transport.netty.NettyServerBuilder;
 
 import io.netty.handler.ssl.SslContext;
-import io.netty.handler.ssl.util.SelfSignedCertificate;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.Socket;
 import java.util.Map;
@@ -173,11 +173,12 @@ public class TestServiceServer {
     private final ServerImpl server;
 
     public Http2NettyController(boolean enableSSL) throws Exception {
-      // TODO(user): support SSL
       SslContext sslContext = null;
       if (enableSSL) {
-        SelfSignedCertificate ssc = new SelfSignedCertificate();
-        sslContext = SslContext.newServerContext(ssc.certificate(), ssc.privateKey());
+        String dir = "integration-testing/certs";
+        sslContext = SslContext.newServerContext(
+            new File(dir + "/server1.pem"),
+            new File(dir + "/server1.key"));
       }
       server = NettyServerBuilder.forPort(port)
           .executor(executor)
diff --git a/netty/src/main/java/com/google/net/stubby/transport/netty/NettyChannelBuilder.java b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyChannelBuilder.java
index 50f945e45a..a7b8527f5d 100644
--- a/netty/src/main/java/com/google/net/stubby/transport/netty/NettyChannelBuilder.java
+++ b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyChannelBuilder.java
@@ -6,6 +6,7 @@ import com.google.net.stubby.SharedResourceHolder;
 import com.google.net.stubby.transport.ClientTransportFactory;
 
 import io.netty.channel.EventLoopGroup;
+import io.netty.handler.ssl.SslContext;
 
 import java.net.InetSocketAddress;
 
@@ -18,6 +19,7 @@ public final class NettyChannelBuilder extends AbstractChannelBuilder<NettyChann
 
   private NegotiationType negotiationType = NegotiationType.TLS;
   private EventLoopGroup userEventLoopGroup;
+  private SslContext sslContext;
 
   /**
    * Creates a new builder with the given server address.
@@ -61,12 +63,18 @@ public final class NettyChannelBuilder extends AbstractChannelBuilder<NettyChann
     return this;
   }
 
+  /** SSL/TLS context to use instead of the system default. */
+  public NettyChannelBuilder sslContext(SslContext sslContext) {
+    this.sslContext = sslContext;
+    return this;
+  }
+
   @Override
   protected ChannelEssentials buildEssentials() {
     final EventLoopGroup group = (userEventLoopGroup == null)
         ? SharedResourceHolder.get(Utils.DEFAULT_CHANNEL_EVENT_LOOP_GROUP) : userEventLoopGroup;
     ClientTransportFactory transportFactory = new NettyClientTransportFactory(
-        serverAddress, negotiationType, group);
+        serverAddress, negotiationType, group, sslContext);
     Service.Listener listener = null;
     if (userEventLoopGroup == null) {
       listener = new ClosureHook() {
diff --git a/netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientTransport.java b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientTransport.java
index 5db91b40b7..6332d2668c 100644
--- a/netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientTransport.java
+++ b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientTransport.java
@@ -12,14 +12,12 @@ import com.google.net.stubby.transport.AbstractClientTransport;
 import com.google.net.stubby.transport.ClientStream;
 import com.google.net.stubby.transport.ClientStreamListener;
 import com.google.net.stubby.transport.ClientTransport;
-import com.google.net.stubby.util.ssl.SslContextFactory;
 
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.EventLoopGroup;
-import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.nio.NioSocketChannel;
 import io.netty.handler.codec.AsciiString;
 import io.netty.handler.codec.http2.DefaultHttp2Connection;
@@ -36,12 +34,15 @@ import io.netty.handler.codec.http2.Http2Headers;
 import io.netty.handler.codec.http2.Http2InboundFrameLogger;
 import io.netty.handler.codec.http2.Http2OutboundFlowController;
 import io.netty.handler.codec.http2.Http2OutboundFrameLogger;
+import io.netty.handler.ssl.SslContext;
 import io.netty.util.internal.logging.InternalLogLevel;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.ExecutionException;
 
 import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLParameters;
 
 /**
  * A Netty-based {@link ClientTransport} implementation.
@@ -56,12 +57,8 @@ class NettyClientTransport extends AbstractClientTransport {
   private final AsciiString authority;
   private Channel channel;
 
-  NettyClientTransport(InetSocketAddress address, NegotiationType negotiationType) {
-    this(address, negotiationType, new NioEventLoopGroup());
-  }
-
   NettyClientTransport(InetSocketAddress address, NegotiationType negotiationType,
-      EventLoopGroup eventGroup) {
+      EventLoopGroup eventGroup, SslContext sslContext) {
     Preconditions.checkNotNull(negotiationType, "negotiationType");
     this.address = Preconditions.checkNotNull(address, "address");
     this.eventGroup = Preconditions.checkNotNull(eventGroup, "eventGroup");
@@ -79,8 +76,19 @@ class NettyClientTransport extends AbstractClientTransport {
         ssl = false;
         break;
       case TLS:
-        SSLEngine sslEngine = SslContextFactory.getClientContext().createSSLEngine();
-        sslEngine.setUseClientMode(true);
+        if (sslContext == null) {
+          try {
+            sslContext = SslContext.newClientContext();
+          } catch (SSLException ex) {
+            throw new RuntimeException(ex);
+          }
+        }
+        // TODO(user): specify allocator. The method currently ignores it though.
+        SSLEngine sslEngine
+            = sslContext.newEngine(null, address.getHostString(), address.getPort());
+        SSLParameters sslParams = new SSLParameters();
+        sslParams.setEndpointIdentificationAlgorithm("HTTPS");
+        sslEngine.setSSLParameters(sslParams);
         negotiation = Http2Negotiator.tls(handler, sslEngine);
         ssl = true;
         break;
diff --git a/netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientTransportFactory.java b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientTransportFactory.java
index 03a12f23f3..a62118d5fe 100644
--- a/netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientTransportFactory.java
+++ b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientTransportFactory.java
@@ -4,6 +4,7 @@ import com.google.common.base.Preconditions;
 import com.google.net.stubby.transport.ClientTransportFactory;
 
 import io.netty.channel.EventLoopGroup;
+import io.netty.handler.ssl.SslContext;
 
 import java.net.InetSocketAddress;
 
@@ -15,16 +16,18 @@ class NettyClientTransportFactory implements ClientTransportFactory {
   private final InetSocketAddress address;
   private final NegotiationType negotiationType;
   private final EventLoopGroup group;
+  private final SslContext sslContext;
 
   public NettyClientTransportFactory(InetSocketAddress address, NegotiationType negotiationType,
-      EventLoopGroup group) {
+      EventLoopGroup group, SslContext sslContext) {
     this.address = Preconditions.checkNotNull(address, "address");
     this.group = Preconditions.checkNotNull(group, "group");
     this.negotiationType = Preconditions.checkNotNull(negotiationType, "negotiationType");
+    this.sslContext = sslContext;
   }
 
   @Override
   public NettyClientTransport newClientTransport() {
-    return new NettyClientTransport(address, negotiationType, group);
+    return new NettyClientTransport(address, negotiationType, group, sslContext);
   }
 }