diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp
index 3dc9106152e..b3ae0041033 100644
--- a/deps/openssl/openssl.gyp
+++ b/deps/openssl/openssl.gyp
@@ -12,18 +12,6 @@
     {
       'target_name': 'openssl',
       'type': '<(library)',
-      'defines': [
-        # No clue what these are for.
-        'L_ENDIAN',
-        'PURIFY',
-        '_REENTRANT',
-
-        # Heartbeat is a TLS extension, that couldn't be turned off or
-        # asked to be not advertised. Unfortunately this is unacceptable for
-        # Microsoft's IIS, which seems to be ignoring whole ClientHello after
-        # seeing this extension.
-        'OPENSSL_NO_HEARTBEATS',
-      ],
       'sources': [
         'openssl/ssl/bio_ssl.c',
         'openssl/ssl/d1_both.c',
@@ -935,32 +923,20 @@
           ]
         }],
         ['OS=="win"', {
-          'defines': [
-            'MK1MF_BUILD',
-            'WIN32_LEAN_AND_MEAN'
-          ],
           'link_settings': {
             'libraries': [
               '-lgdi32.lib',
               '-luser32.lib',
             ]
-          }
+          },
+          'defines': [
+            'DSO_WIN32',
+          ],
         }, {
           'defines': [
-            # ENGINESDIR must be defined if OPENSSLDIR is.
-            'ENGINESDIR="/dev/null"',
-            # Set to ubuntu default path for convenience. If necessary, override
-            # this at runtime with the SSL_CERT_DIR environment variable.
-            'OPENSSLDIR="/etc/ssl"',
-            'TERMIOS',
+            'DSO_DLFCN',
+            'HAVE_DLFCN_H'
           ],
-          'cflags': ['-Wno-missing-field-initializers'],
-        }],
-        ['is_clang==1 or gcc_version>=43', {
-          'cflags': ['-Wno-old-style-declaration'],
-        }],
-        ['OS=="solaris"', {
-          'defines': ['__EXTENSIONS__'],
         }],
         ['target_arch=="arm"', {
           'sources': ['openssl/crypto/armcap.c'],
@@ -981,7 +957,160 @@
         'include_dirs': ['openssl/include'],
       },
     },
+    {
+      'target_name': 'openssl-cli',
+      'type': 'executable',
+      'dependencies': [
+        'openssl',
+      ],
+      'defines': [
+        'MONOLITH',
+      ],
+      'sources': [
+        'openssl/apps/app_rand.c',
+        'openssl/apps/apps.c',
+        'openssl/apps/asn1pars.c',
+        'openssl/apps/ca.c',
+        'openssl/apps/ciphers.c',
+        'openssl/apps/cms.c',
+        'openssl/apps/crl.c',
+        'openssl/apps/crl2p7.c',
+        'openssl/apps/dgst.c',
+        'openssl/apps/dh.c',
+        'openssl/apps/dhparam.c',
+        'openssl/apps/dsa.c',
+        'openssl/apps/dsaparam.c',
+        'openssl/apps/ec.c',
+        'openssl/apps/ecparam.c',
+        'openssl/apps/enc.c',
+        'openssl/apps/engine.c',
+        'openssl/apps/errstr.c',
+        'openssl/apps/gendh.c',
+        'openssl/apps/gendsa.c',
+        'openssl/apps/genpkey.c',
+        'openssl/apps/genrsa.c',
+        'openssl/apps/nseq.c',
+        'openssl/apps/ocsp.c',
+        'openssl/apps/openssl.c',
+        'openssl/apps/passwd.c',
+        'openssl/apps/pkcs12.c',
+        'openssl/apps/pkcs7.c',
+        'openssl/apps/pkcs8.c',
+        'openssl/apps/pkey.c',
+        'openssl/apps/pkeyparam.c',
+        'openssl/apps/pkeyutl.c',
+        'openssl/apps/prime.c',
+        'openssl/apps/rand.c',
+        'openssl/apps/req.c',
+        'openssl/apps/rsa.c',
+        'openssl/apps/rsautl.c',
+        'openssl/apps/s_cb.c',
+        'openssl/apps/s_client.c',
+        'openssl/apps/s_server.c',
+        'openssl/apps/s_socket.c',
+        'openssl/apps/s_time.c',
+        'openssl/apps/sess_id.c',
+        'openssl/apps/smime.c',
+        'openssl/apps/speed.c',
+        'openssl/apps/spkac.c',
+        'openssl/apps/srp.c',
+        'openssl/apps/ts.c',
+        'openssl/apps/verify.c',
+        'openssl/apps/version.c',
+        'openssl/apps/x509.c',
+      ],
+      'conditions': [
+        ['OS=="solaris"', {
+          'libraries': [
+            '-lsocket',
+            '-lnsl',
+          ]
+        }],
+        ['OS=="win"', {
+          'link_settings': {
+            'libraries': [
+              '-lws2_32.lib',
+              '-lgdi32.lib',
+              '-ladvapi32.lib',
+              '-lcrypt32.lib',
+              '-luser32.lib',
+            ],
+          },
+        }],
+        [ 'OS in "linux android"', {
+          'link_settings': {
+            'libraries': [
+              '-ldl',
+            ],
+          },
+        }],
+      ]
+    }
   ],
+  'target_defaults': {
+    'include_dirs': [
+      '.',
+      'openssl',
+      'openssl/crypto',
+      'openssl/crypto/asn1',
+      'openssl/crypto/evp',
+      'openssl/crypto/md2',
+      'openssl/crypto/modes',
+      'openssl/crypto/store',
+      'openssl/include',
+    ],
+    'defines': [
+      # No clue what these are for.
+      'L_ENDIAN',
+      'PURIFY',
+      '_REENTRANT',
+
+      # Heartbeat is a TLS extension, that couldn't be turned off or
+      # asked to be not advertised. Unfortunately this is unacceptable for
+      # Microsoft's IIS, which seems to be ignoring whole ClientHello after
+      # seeing this extension.
+      'OPENSSL_NO_HEARTBEATS',
+    ],
+    'conditions': [
+      ['OS=="win"', {
+        'defines': [
+          'MK1MF_BUILD',
+          'WIN32_LEAN_AND_MEAN',
+          'OPENSSL_SYSNAME_WIN32',
+        ],
+      }, {
+        'defines': [
+          # ENGINESDIR must be defined if OPENSSLDIR is.
+          'ENGINESDIR="/dev/null"',
+          'TERMIOS',
+        ],
+        'cflags': ['-Wno-missing-field-initializers'],
+        'conditions': [
+          ['OS=="mac"', {
+            'defines': [
+              # Set to ubuntu default path for convenience. If necessary,
+              # override this at runtime with the SSL_CERT_DIR environment
+              # variable.
+              'OPENSSLDIR="/System/Library/OpenSSL/"',
+            ],
+          }, {
+            'defines': [
+              # Set to ubuntu default path for convenience. If necessary,
+              # override this at runtime with the SSL_CERT_DIR environment
+              # variable.
+              'OPENSSLDIR="/etc/ssl"',
+            ],
+          }],
+        ]
+      }],
+      ['is_clang==1 or gcc_version>=43', {
+        'cflags': ['-Wno-old-style-declaration'],
+      }],
+      ['OS=="solaris"', {
+        'defines': ['__EXTENSIONS__'],
+      }],
+    ],
+  },
 }
 
 # Local Variables:
diff --git a/node.gyp b/node.gyp
index 38311a1cc40..348040e03dd 100644
--- a/node.gyp
+++ b/node.gyp
@@ -149,7 +149,12 @@
           'sources': [ 'src/node_crypto.cc' ],
           'conditions': [
             [ 'node_shared_openssl=="false"', {
-              'dependencies': [ './deps/openssl/openssl.gyp:openssl' ],
+              'dependencies': [
+                './deps/openssl/openssl.gyp:openssl',
+
+                # For tests
+                './deps/openssl/openssl.gyp:openssl-cli',
+              ],
             }]]
         }, {
           'defines': [ 'HAVE_OPENSSL=0' ]
diff --git a/test/common.js b/test/common.js
index 28faaf97885..a4759219700 100644
--- a/test/common.js
+++ b/test/common.js
@@ -20,6 +20,7 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 var path = require('path');
+var fs = require('fs');
 var assert = require('assert');
 
 exports.testDir = path.dirname(__filename);
@@ -30,9 +31,13 @@ exports.PORT = +process.env.NODE_COMMON_PORT || 12346;
 
 if (process.platform === 'win32') {
   exports.PIPE = '\\\\.\\pipe\\libuv-test';
+  exports.opensslCli = path.join(process.execPath, '..', 'openssl-cli.exe');
 } else {
   exports.PIPE = exports.tmpDir + '/test.sock';
+  exports.opensslCli = path.join(process.execPath, '..', 'openssl-cli');
 }
+if (!fs.existsSync(exports.opensslCli))
+  exports.opensslCli = false;
 
 var util = require('util');
 for (var i in util) exports[i] = util[i];
diff --git a/test/fixtures/keys/agent1-cert.pem b/test/fixtures/keys/agent1-cert.pem
index 816f6fbf17c..48df0f90c00 100644
--- a/test/fixtures/keys/agent1-cert.pem
+++ b/test/fixtures/keys/agent1-cert.pem
@@ -1,14 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIICKjCCAZMCCQDQ8o4kHKdCPDANBgkqhkiG9w0BAQUFADB6MQswCQYDVQQGEwJV
+MIICbjCCAdcCCQDQ8o4kHKdCPTANBgkqhkiG9w0BAQUFADB6MQswCQYDVQQGEwJV
 UzELMAkGA1UECBMCQ0ExCzAJBgNVBAcTAlNGMQ8wDQYDVQQKEwZKb3llbnQxEDAO
 BgNVBAsTB05vZGUuanMxDDAKBgNVBAMTA2NhMTEgMB4GCSqGSIb3DQEJARYRcnlA
-dGlueWNsb3Vkcy5vcmcwHhcNMTEwMzE0MTgyOTEyWhcNMzgwNzI5MTgyOTEyWjB9
+dGlueWNsb3Vkcy5vcmcwHhcNMTQwNzIzMTk1MTAwWhcNNDExMjA3MTk1MTAwWjB9
 MQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExCzAJBgNVBAcTAlNGMQ8wDQYDVQQK
 EwZKb3llbnQxEDAOBgNVBAsTB05vZGUuanMxDzANBgNVBAMTBmFnZW50MTEgMB4G
-CSqGSIb3DQEJARYRcnlAdGlueWNsb3Vkcy5vcmcwXDANBgkqhkiG9w0BAQEFAANL
-ADBIAkEAnzpAqcoXZxWJz/WFK7BXwD23jlREyG11x7gkydteHvn6PrVBbB5yfu6c
-bk8w3/Ar608AcyMQ9vHjkLQKH7cjEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAKha
-HqjCfTIut+m/idKy3AoFh48tBHo3p9Nl5uBjQJmahKdZAaiksL24Pl+NzPQ8LIU+
-FyDHFp6OeJKN6HzZ72Bh9wpBVu6Uj1hwhZhincyTXT80wtSI/BoUAW8Ls2kwPdus
-64LsJhhxqj2m4vPKNRbHB2QxnNrGi30CUf3kt3Ia
+CSqGSIb3DQEJARYRcnlAdGlueWNsb3Vkcy5vcmcwgZ8wDQYJKoZIhvcNAQEBBQAD
+gY0AMIGJAoGBAPFDMzOUh98P99mKwmtR8UxzTHtspXlAsp3pHSNWTRmkHVZfO51d
+hxs5FXjhXwwxfJ3ucG9BFu40qhOsHsnkAUrC/F+jWMmmbeQbpv3XXLOc3rNvqQJM
+GX0qKheNsgtGLDMByj7664cIpa7TbQim8Go3WvLxCVlJAo2d6j+KW+WNAgMBAAEw
+DQYJKoZIhvcNAQEFBQADgYEADu1ZIfp79Y2/Vn6/Hn+1+D9KyKzMAwkulc/UKezx
+9XVn6EDnOkZE3sOa/sK+6OpnzZHRW3slEbQT1nyo4Gn+2d0GH5pmDPZ5S1iebxdM
+snm5pQHmKbeqHCw1aPsShLX2+rVrfE5ywVOOPIC4IvP8H8vm1Eoj7LecA2FmxMH6
+juc=
 -----END CERTIFICATE-----
diff --git a/test/fixtures/keys/agent1-csr.pem b/test/fixtures/keys/agent1-csr.pem
index 748fd000367..4148c3a4c29 100644
--- a/test/fixtures/keys/agent1-csr.pem
+++ b/test/fixtures/keys/agent1-csr.pem
@@ -1,10 +1,13 @@
 -----BEGIN CERTIFICATE REQUEST-----
-MIIBXTCCAQcCAQAwfTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMQswCQYDVQQH
+MIIB4jCCAUsCAQAwfTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMQswCQYDVQQH
 EwJTRjEPMA0GA1UEChMGSm95ZW50MRAwDgYDVQQLEwdOb2RlLmpzMQ8wDQYDVQQD
-EwZhZ2VudDExIDAeBgkqhkiG9w0BCQEWEXJ5QHRpbnljbG91ZHMub3JnMFwwDQYJ
-KoZIhvcNAQEBBQADSwAwSAJBAJ86QKnKF2cVic/1hSuwV8A9t45URMhtdce4JMnb
-Xh75+j61QWwecn7unG5PMN/wK+tPAHMjEPbx45C0Ch+3IxECAwEAAaAlMCMGCSqG
-SIb3DQEJBzEWExRBIGNoYWxsZW5nZSBwYXNzd29yZDANBgkqhkiG9w0BAQUFAANB
-AF+AfG64hNyYHum46m6i7RgnUBrJSOynGjs23TekV4he3QdMSAAPPqbll8W14+y3
-vOo7/yQ2v2uTqxCjakUNPPs=
+EwZhZ2VudDExIDAeBgkqhkiG9w0BCQEWEXJ5QHRpbnljbG91ZHMub3JnMIGfMA0G
+CSqGSIb3DQEBAQUAA4GNADCBiQKBgQDxQzMzlIffD/fZisJrUfFMc0x7bKV5QLKd
+6R0jVk0ZpB1WXzudXYcbORV44V8MMXyd7nBvQRbuNKoTrB7J5AFKwvxfo1jJpm3k
+G6b911yznN6zb6kCTBl9KioXjbILRiwzAco++uuHCKWu020IpvBqN1ry8QlZSQKN
+neo/ilvljQIDAQABoCUwIwYJKoZIhvcNAQkHMRYTFEEgY2hhbGxlbmdlIHBhc3N3
+b3JkMA0GCSqGSIb3DQEBBQUAA4GBAHMP0MU6e7QlbsaJ6g/KNOC5FJn6+M4E5ZaP
+tkFHlITUF8SBKWZz6UUYTTdT0/C3KAPT7STHkWCfh0yYgidckdWYB/esF12y0/S7
+c4qr4iD548Jx/g0Mn/5B4+9gwFTrsd5uktOrgF7VVsQ1nGr5QKMRbrtGDjCrXA8Q
+rjIWhd12
 -----END CERTIFICATE REQUEST-----
diff --git a/test/fixtures/keys/agent1-key.pem b/test/fixtures/keys/agent1-key.pem
index 5dae7eb99d5..5d8e050296e 100644
--- a/test/fixtures/keys/agent1-key.pem
+++ b/test/fixtures/keys/agent1-key.pem
@@ -1,9 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIBOwIBAAJBAJ86QKnKF2cVic/1hSuwV8A9t45URMhtdce4JMnbXh75+j61QWwe
-cn7unG5PMN/wK+tPAHMjEPbx45C0Ch+3IxECAwEAAQJBAI2cU1IuR+4IO87WPyAB
-76kruoo87AeNQkjjvuQ/00+b/6IS45mcEP5Kw0NukbqBhIw2di9uQ9J51DJ/ZfQr
-+YECIQDUHaN3ZjIdJ7/w8Yq9Zzz+3kY2F/xEz6e4ftOFW8bY2QIhAMAref+WYckC
-oECgOLAvAxB1lI4j7oCbAaawfxKdnPj5AiEAi95rXx09aGpAsBGmSdScrPdG1v6j
-83/2ebrvoZ1uFqkCIB0AssnrRVjUB6GZTNTyU3ERfdkx/RX1zvr8WkFR/lXpAiB7
-cUZ1i8ZkZrPrdVgw2cb28UJM7qZHQnXcMHTXFFvxeQ==
+MIICXwIBAAKBgQDxQzMzlIffD/fZisJrUfFMc0x7bKV5QLKd6R0jVk0ZpB1WXzud
+XYcbORV44V8MMXyd7nBvQRbuNKoTrB7J5AFKwvxfo1jJpm3kG6b911yznN6zb6kC
+TBl9KioXjbILRiwzAco++uuHCKWu020IpvBqN1ry8QlZSQKNneo/ilvljQIDAQAB
+AoGBAOS++zfHdv+WSz92IZnRaoA6vWQ0gbuyDOhNkrPjalyKTsqKpqIwgB3ehK5E
+uHJ+JRI0dWP2icA2LJ9UTSjMRi99yq+8vXi2aUeWD09e1EBBc1JkSA2ZF/nxL4pT
+dmJJbhIz4wrbuKUjQBmyxIPs775D5QOnc9d/bVkSq7iB11WhAkEA/eFKyBR2qjUe
+SWEAp3RHi4ZqYna6WZ8dsPvoJ/hhyXNAuHZly8aRonjXJsT6kIuzXlMURVypFcrD
+EbJeNzonKQJBAPNG75kmQD1z34UlBx6lnwt74/M8Iuu4Dm344zyBrWj+qDoNz4Ye
+PEZRo0T9bOKaaI/4jLYATWx1+r4ZXxIlC8UCQQCSOtXL8J145CeRtGGgEgWzg7R7
+Ck/DlzaO3kmV3CbW1Z+NoAR6HuF7Z4blOcfowc6KoeenG/v4JVW+N7K0tLYhAkEA
+75dNIWeqnNshp99vw58ZpBW/yi3PtpbunyAfq9eLEXy78XDokQ32DssYITn1orav
+hBsleZmSpt8Ks24JU7VogQJBAOxe8AiqFi6rxY5V8vBUxf7YX5rc0E8AJ+vT8yey
+2Mi7sgzKuEV3SE8xdaLwJLaJ1L28zFbGM3TXuTXHHzp9Wh0=
 -----END RSA PRIVATE KEY-----
diff --git a/test/fixtures/keys/agent2-cert.pem b/test/fixtures/keys/agent2-cert.pem
index 8e4354db4ed..29c151604f5 100644
--- a/test/fixtures/keys/agent2-cert.pem
+++ b/test/fixtures/keys/agent2-cert.pem
@@ -1,13 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIIB7DCCAZYCCQC7gs0MDNn6MTANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJV
+MIICcTCCAdoCCQCalREW1v1r6zANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJV
 UzELMAkGA1UECBMCQ0ExCzAJBgNVBAcTAlNGMQ8wDQYDVQQKEwZKb3llbnQxEDAO
 BgNVBAsTB05vZGUuanMxDzANBgNVBAMTBmFnZW50MjEgMB4GCSqGSIb3DQEJARYR
-cnlAdGlueWNsb3Vkcy5vcmcwHhcNMTEwMzE0MTgyOTEyWhcNMzgwNzI5MTgyOTEy
+cnlAdGlueWNsb3Vkcy5vcmcwHhcNMTQwNzIzMTk1MTAwWhcNNDExMjA3MTk1MTAw
 WjB9MQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExCzAJBgNVBAcTAlNGMQ8wDQYD
 VQQKEwZKb3llbnQxEDAOBgNVBAsTB05vZGUuanMxDzANBgNVBAMTBmFnZW50MjEg
-MB4GCSqGSIb3DQEJARYRcnlAdGlueWNsb3Vkcy5vcmcwXDANBgkqhkiG9w0BAQEF
-AANLADBIAkEAyXb8FrRdKbhrKLgLSsn61i1C7w7fVVVd7OQsmV/7p9WB2lWFiDlC
-WKGU9SiIz/A6wNZDUAuc2E+VwtpCT561AQIDAQABMA0GCSqGSIb3DQEBBQUAA0EA
-C8HzpuNhFLCI3A5KkBS5zHAQax6TFUOhbpBCR0aTDbJ6F1liDTK1lmU/BjvPoj+9
-1LHwrmh29rK8kBPEjmymCQ==
+MB4GCSqGSIb3DQEJARYRcnlAdGlueWNsb3Vkcy5vcmcwgZ8wDQYJKoZIhvcNAQEB
+BQADgY0AMIGJAoGBANY5OgRa+YpShm6ZgJqfhbBH1vYAIgbbzla1FsCv8KUmg1eH
+6HmAtRVwE/I6kYIa9hLd48IIkdVqUmPXD8KZWrq7EDMLX/HUoPYHdh4caxLkKSzk
+h+KtFpunst2fwqog5dfegZQCviF3g2UWN6Zh2nUCfaiX0IWGipnryXD0IvRvAgMB
+AAEwDQYJKoZIhvcNAQEFBQADgYEAEhaGIMyK0cmCXZlLCXBiDtXhJ0WGbMIvYHRN
+kE1gJ42sHyDHW7SKpL0gISdtUuULV+Zo/qgGAutJHomGgGuLcESWHQe1PChYxwBh
+Q8iaNO/itVvP6fXuNKfrWJxwnAxGSYu2/YdFSSfhS+JsSc5aq7EU3+8dS7Q3F9W3
++9ufnF0=
 -----END CERTIFICATE-----
diff --git a/test/fixtures/keys/agent2-csr.pem b/test/fixtures/keys/agent2-csr.pem
index a670c4c632b..182ca1ccce3 100644
--- a/test/fixtures/keys/agent2-csr.pem
+++ b/test/fixtures/keys/agent2-csr.pem
@@ -1,10 +1,13 @@
 -----BEGIN CERTIFICATE REQUEST-----
-MIIBXTCCAQcCAQAwfTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMQswCQYDVQQH
+MIIB4jCCAUsCAQAwfTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMQswCQYDVQQH
 EwJTRjEPMA0GA1UEChMGSm95ZW50MRAwDgYDVQQLEwdOb2RlLmpzMQ8wDQYDVQQD
-EwZhZ2VudDIxIDAeBgkqhkiG9w0BCQEWEXJ5QHRpbnljbG91ZHMub3JnMFwwDQYJ
-KoZIhvcNAQEBBQADSwAwSAJBAMl2/Ba0XSm4ayi4C0rJ+tYtQu8O31VVXezkLJlf
-+6fVgdpVhYg5QlihlPUoiM/wOsDWQ1ALnNhPlcLaQk+etQECAwEAAaAlMCMGCSqG
-SIb3DQEJBzEWExRBIGNoYWxsZW5nZSBwYXNzd29yZDANBgkqhkiG9w0BAQUFAANB
-AJnll2pt5l0pzskQSpjjLVTlFDFmJr/AZ3UK8v0WxBjYjCe5Jx4YehkChpxIyDUm
-U3J9q9MDUf0+Y2+EGkssFfk=
+EwZhZ2VudDIxIDAeBgkqhkiG9w0BCQEWEXJ5QHRpbnljbG91ZHMub3JnMIGfMA0G
+CSqGSIb3DQEBAQUAA4GNADCBiQKBgQDWOToEWvmKUoZumYCan4WwR9b2ACIG285W
+tRbAr/ClJoNXh+h5gLUVcBPyOpGCGvYS3ePCCJHValJj1w/CmVq6uxAzC1/x1KD2
+B3YeHGsS5Cks5IfirRabp7Ldn8KqIOXX3oGUAr4hd4NlFjemYdp1An2ol9CFhoqZ
+68lw9CL0bwIDAQABoCUwIwYJKoZIhvcNAQkHMRYTFEEgY2hhbGxlbmdlIHBhc3N3
+b3JkMA0GCSqGSIb3DQEBBQUAA4GBALkokJAd9fZM0tF3qluKGqZVT3rWvoEjm64I
+13niqtvGIUirIPhcNm6oCYOeBMt1N0Yvgr/UYhfuicQFAcxP5u4I2QaV0AYB7fbR
+hvaL8BoZ9KlsbqrwyizNnxNqEkM1lcTBevKRad3zuPHcfOWArHt6JtVNJOmgChTp
+VsO5mtJV
 -----END CERTIFICATE REQUEST-----
diff --git a/test/fixtures/keys/agent2-key.pem b/test/fixtures/keys/agent2-key.pem
index 522903c6354..459f2550de4 100644
--- a/test/fixtures/keys/agent2-key.pem
+++ b/test/fixtures/keys/agent2-key.pem
@@ -1,9 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIBOgIBAAJBAMl2/Ba0XSm4ayi4C0rJ+tYtQu8O31VVXezkLJlf+6fVgdpVhYg5
-QlihlPUoiM/wOsDWQ1ALnNhPlcLaQk+etQECAwEAAQJBAMT6Bf34+UHKY1ObpsbH
-9u2jsVblFq1rWvs8GPMY6oertzvwm3DpuSUp7PTgOB1nLTLYtCERbQ4ovtN8tn3p
-OHUCIQDzIEGsoCr5vlxXvy2zJwu+fxYuhTZWMVuo1397L0VyhwIhANQh+yzqUgaf
-WRtSB4T2W7ADtJI35ET61jKBty3CqJY3AiAIwju7dVW3A5WeD6Qc1SZGKZvp9yCb
-AFI2BfVwwaY11wIgXF3PeGcvACMyMWsuSv7aPXHfliswAbkWuzcwA4TW01ECIGWa
-cgsDvVFxmfM5NPSuT/UDTa6R5BFISB5ea0N0AR3I
+MIICXgIBAAKBgQDWOToEWvmKUoZumYCan4WwR9b2ACIG285WtRbAr/ClJoNXh+h5
+gLUVcBPyOpGCGvYS3ePCCJHValJj1w/CmVq6uxAzC1/x1KD2B3YeHGsS5Cks5Ifi
+rRabp7Ldn8KqIOXX3oGUAr4hd4NlFjemYdp1An2ol9CFhoqZ68lw9CL0bwIDAQAB
+AoGBAMDw1dIqZeoxHabrVirtVilI6tCxmfP3cMYjX5S4YdM89rqVS8pzI6VlRnG6
+UmeOBOdFNecCdOZ0VjRZ9HXeTRmPkEhUc9QY5MJXjDp48WK+1LIey33IsfEE35mp
+ETrP+3VVRnSioG0X3COX73I0gOM+DhYl5uQF/2Cas2Fryy9hAkEA7g6hlBzhTGPj
+wQE8pUBGdVyke6FoDrT/EJhlzG6UOveBVwm20jBeaMSsufqu2fm86UgmW6C2JZzH
+1KrbEXoVyQJBAOZeuGaiCQ+ETFAFjEn782wRq5pcqWOLt5tOwx06cf62PJKtFsXJ
+rOuBWlu4zGLD3IIpD3nqh67XvgtFSftGNHcCQDKkni8aLbvIjE0k7Dfjgpm5Cazb
+W321d4WaRh3FcHdS7AsOH/x7GbqEDJLMB6KLhGrEVJStjdJWlhRh/JStOjECQQDd
+kIxaac29Fskuzac4IRLmBbi+JhDkpSRaQ051dhjdmfh4OfGFGYsulqKJRRuOgkI7
+DbLM1zzYdLdbr7CP893RAkEAnyXAB0NQ2EImlFhbQRDirHgq8URu+/cVW3qBrOcL
+GIXr1KwvrIN//ZjpFwotKjQViM86nw6PpVywmOiP7Lrvag==
 -----END RSA PRIVATE KEY-----
diff --git a/test/fixtures/keys/agent3-cert.pem b/test/fixtures/keys/agent3-cert.pem
index e4a235079fb..70ce79a528f 100644
--- a/test/fixtures/keys/agent3-cert.pem
+++ b/test/fixtures/keys/agent3-cert.pem
@@ -1,14 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIICKjCCAZMCCQCDBr594bsJmTANBgkqhkiG9w0BAQUFADB6MQswCQYDVQQGEwJV
+MIICbjCCAdcCCQCDBr594bsJmzANBgkqhkiG9w0BAQUFADB6MQswCQYDVQQGEwJV
 UzELMAkGA1UECBMCQ0ExCzAJBgNVBAcTAlNGMQ8wDQYDVQQKEwZKb3llbnQxEDAO
 BgNVBAsTB05vZGUuanMxDDAKBgNVBAMTA2NhMjEgMB4GCSqGSIb3DQEJARYRcnlA
-dGlueWNsb3Vkcy5vcmcwHhcNMTEwMzE0MTgyOTEyWhcNMzgwNzI5MTgyOTEyWjB9
+dGlueWNsb3Vkcy5vcmcwHhcNMTQwNzIzMTk1MTAwWhcNNDExMjA3MTk1MTAwWjB9
 MQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExCzAJBgNVBAcTAlNGMQ8wDQYDVQQK
 EwZKb3llbnQxEDAOBgNVBAsTB05vZGUuanMxDzANBgNVBAMTBmFnZW50MzEgMB4G
-CSqGSIb3DQEJARYRcnlAdGlueWNsb3Vkcy5vcmcwXDANBgkqhkiG9w0BAQEFAANL
-ADBIAkEAtlNDZ+bHeBI0B2gD/IWqA7Aq1hwsnS4+XpnLesjTQcL2JwFFpkR0oWrw
-yjrYhCogi7c5gjKrLZF1d2JD5JgHgQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAJoK
-bXwsImk7vJz9649yrmsXwnuGbEKVYMvqcGyjaZNP9lYEG41y5CeRzxhWy2rlYdhE
-f2nqE2lg75oJP7LQqfQY7aCqwahM3q/GQbsfKVCGjF7TVyq9TQzd8iW+FEJIQzSE
-3aN85hR67+3VAXeSzmkGSVBO2m1SJIug4qftIkc2
+CSqGSIb3DQEJARYRcnlAdGlueWNsb3Vkcy5vcmcwgZ8wDQYJKoZIhvcNAQEBBQAD
+gY0AMIGJAoGBAM69c5za1Aj3bO1Nzl/qt/p3MaadCn7OxP3KKqeu7DiFIKOYq+k5
+MVjzfVZqZoy+H5z/Tuan6+7LawGWmJHaIT7POvmsOQhy86AJE07s9Z+5tDk6SPku
+tzJohyPlWPlSJ+q/v7pwWU+En55z8ihLtA5On77OZK8JL+qYjOFlhYx5AgMBAAEw
+DQYJKoZIhvcNAQEFBQADgYEAX6z18J8/wzKJJb+hFngaIrUt052AsBXOvF83XOg0
+dEiQK+X3pZSPCF3a0g1iJQMIHuJvnLUuqUfIDQLqkBEtlrXbT/1UqaDu12neImJ6
+XI6O3TkSoyxkH461qMu/Q3Um2RW1o2oVlYdjzZgBeKE2ilhDTsJcdNGZTXP4ZW/j
+VHc=
 -----END CERTIFICATE-----
diff --git a/test/fixtures/keys/agent3-csr.pem b/test/fixtures/keys/agent3-csr.pem
index e6c0c74b3ae..b8bb2c95f8e 100644
--- a/test/fixtures/keys/agent3-csr.pem
+++ b/test/fixtures/keys/agent3-csr.pem
@@ -1,10 +1,13 @@
 -----BEGIN CERTIFICATE REQUEST-----
-MIIBXTCCAQcCAQAwfTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMQswCQYDVQQH
+MIIB4jCCAUsCAQAwfTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMQswCQYDVQQH
 EwJTRjEPMA0GA1UEChMGSm95ZW50MRAwDgYDVQQLEwdOb2RlLmpzMQ8wDQYDVQQD
-EwZhZ2VudDMxIDAeBgkqhkiG9w0BCQEWEXJ5QHRpbnljbG91ZHMub3JnMFwwDQYJ
-KoZIhvcNAQEBBQADSwAwSAJBALZTQ2fmx3gSNAdoA/yFqgOwKtYcLJ0uPl6Zy3rI
-00HC9icBRaZEdKFq8Mo62IQqIIu3OYIyqy2RdXdiQ+SYB4ECAwEAAaAlMCMGCSqG
-SIb3DQEJBzEWExRBIGNoYWxsZW5nZSBwYXNzd29yZDANBgkqhkiG9w0BAQUFAANB
-AEGo76iH+a8pnE+RWQT+wg9/BL+iIuqrcFXLs0rbGonqderrwXAe15ODwql/Bfu3
-zgMt8ooTsgMPcMX9EgmubEM=
+EwZhZ2VudDMxIDAeBgkqhkiG9w0BCQEWEXJ5QHRpbnljbG91ZHMub3JnMIGfMA0G
+CSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOvXOc2tQI92ztTc5f6rf6dzGmnQp+zsT9
+yiqnruw4hSCjmKvpOTFY831WamaMvh+c/07mp+vuy2sBlpiR2iE+zzr5rDkIcvOg
+CRNO7PWfubQ5Okj5LrcyaIcj5Vj5Uifqv7+6cFlPhJ+ec/IoS7QOTp++zmSvCS/q
+mIzhZYWMeQIDAQABoCUwIwYJKoZIhvcNAQkHMRYTFEEgY2hhbGxlbmdlIHBhc3N3
+b3JkMA0GCSqGSIb3DQEBBQUAA4GBACPgD5L6BWcjXXc+UoC8ZNhSQl3Fc4lsbzdF
+VhKfvIh2l1Ywz4xCKkC+mRxKQFbj8KNXKx1xBrkvuzVvVXCwkqhkBLDWFhVCsoG8
+Z3YpDz2fu2xOw2Ogjnx5zTNauoxl/oYI9AoWcs6FaOiVFgw7IsejGjReeV4zaeLe
+j0XujlKJ
 -----END CERTIFICATE REQUEST-----
diff --git a/test/fixtures/keys/agent3-key.pem b/test/fixtures/keys/agent3-key.pem
index d72f071e4c0..f9ba7b6d672 100644
--- a/test/fixtures/keys/agent3-key.pem
+++ b/test/fixtures/keys/agent3-key.pem
@@ -1,9 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIBOwIBAAJBALZTQ2fmx3gSNAdoA/yFqgOwKtYcLJ0uPl6Zy3rI00HC9icBRaZE
-dKFq8Mo62IQqIIu3OYIyqy2RdXdiQ+SYB4ECAwEAAQJAIk+G9s2SKgFa8y3a2jGZ
-LfqABSzmJGooaIsOpLuYLd6eCC31XUDlT4rPVGRhysKQCQ4+NMjgdnj9ZqNnvXY/
-RQIhAOgbdltr3Ey2hy7RuDW5rmOeJTuVqCrZ7QI8ifyCEbYTAiEAyRfvWSvvASeP
-kZTMUhATRUpuyDQW+058NE0oJSinTpsCIQCR/FPhBGI3TcaQyA9Ym0T4GwvIAkUX
-TqInefRAAX8qSQIgZVJPAdIWGbHSL9sWW97HpukLCorcbYEtKbkamiZyrjMCIQCX
-lX76ttkeId5OsJGQcF67eFMMr2UGZ1WMf6M39lCYHQ==
+MIICXgIBAAKBgQDOvXOc2tQI92ztTc5f6rf6dzGmnQp+zsT9yiqnruw4hSCjmKvp
+OTFY831WamaMvh+c/07mp+vuy2sBlpiR2iE+zzr5rDkIcvOgCRNO7PWfubQ5Okj5
+LrcyaIcj5Vj5Uifqv7+6cFlPhJ+ec/IoS7QOTp++zmSvCS/qmIzhZYWMeQIDAQAB
+AoGBAM4ONbUYxk1Jjt/WtOMU5tpVAr+1tkg9fkoVvf3zcq3Cwo1MFcwWnQCzbzE6
+S4vr00Z/kPyEUbtoM/cZSmfUqVxOEc10QGyAm8c88zHiuKmoFFElrYR6kVNUvWZS
+TsLb1vznvuxkajdkOzVEyLj7Q+lYbd0dpc18fbMeV8VEFL6BAkEA7SI046SI44Zc
+sJ/vIDvl1vbnGo/5kTb3egzVpH52UkmjadeBZG/iN6UxyMKlP9Wpazod332Bnr7p
+UYD0S6g1xQJBAN8wNQk9LSDXrUkb/z1WMYbx5UHfJaWBLdVcYfHCsbyzwrdGjH77
+6Rb6QwgP4piAKMRUNLAPPBSFUs/Ma+kCGyUCQQCklhxdcAKu4MAOu0LufYReOkpX
+DlzqpFsKNERIgpm/LWsleDVPr7Q0aQzvyeGGN9b6HIFFcEf6FYm9TyLALET9AkA7
+dCoMpgFJiGqe2RhrDHTxD6sUmw76Qakl9xAYSNbz/6bVD7QJd62l81C76w9ftHQn
+qI7If6ZviPyAYmI0ld0JAkEArE8YZSpszCwaEIrx9XLHPTNPgBkVgsv+LI0cekry
+LFXL05GkfJ9GLRoRtrcuLAq/Bk99NJ+F+Rwp9sr7o910Gw==
 -----END RSA PRIVATE KEY-----
diff --git a/test/fixtures/keys/agent4-cert.pem b/test/fixtures/keys/agent4-cert.pem
index 07157b919b2..8a23443dd94 100644
--- a/test/fixtures/keys/agent4-cert.pem
+++ b/test/fixtures/keys/agent4-cert.pem
@@ -1,15 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIICSDCCAbGgAwIBAgIJAIMGvn3huwmaMA0GCSqGSIb3DQEBBQUAMHoxCzAJBgNV
+MIICjDCCAfWgAwIBAgIJAIMGvn3huwmcMA0GCSqGSIb3DQEBBQUAMHoxCzAJBgNV
 BAYTAlVTMQswCQYDVQQIEwJDQTELMAkGA1UEBxMCU0YxDzANBgNVBAoTBkpveWVu
 dDEQMA4GA1UECxMHTm9kZS5qczEMMAoGA1UEAxMDY2EyMSAwHgYJKoZIhvcNAQkB
-FhFyeUB0aW55Y2xvdWRzLm9yZzAeFw0xMTAzMTQxODI5MTJaFw0zODA3MjkxODI5
-MTJaMH0xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTELMAkGA1UEBxMCU0YxDzAN
+FhFyeUB0aW55Y2xvdWRzLm9yZzAeFw0xNDA3MjMxOTUxMDBaFw00MTEyMDcxOTUx
+MDBaMH0xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTELMAkGA1UEBxMCU0YxDzAN
 BgNVBAoTBkpveWVudDEQMA4GA1UECxMHTm9kZS5qczEPMA0GA1UEAxMGYWdlbnQ0
-MSAwHgYJKoZIhvcNAQkBFhFyeUB0aW55Y2xvdWRzLm9yZzBcMA0GCSqGSIb3DQEB
-AQUAA0sAMEgCQQDN/yMfmQ8zdvmjlGk7b3Mn6wY2FjaMb4c5ENJX15vyYhKS1zhx
-6n0kQIn2vf6yqG7tO5Okz2IJiD9Sa06mK6GrAgMBAAGjFzAVMBMGA1UdJQQMMAoG
-CCsGAQUFBwMCMA0GCSqGSIb3DQEBBQUAA4GBAA8FXpRmdrHBdlofNvxa14zLvv0N
-WnUGUmxVklFLKXvpVWTanOhVgI2TDCMrT5WvCRTD25iT1EUKWxjDhFJrklQJ+IfC
-KC6fsgO7AynuxWSfSkc8/acGiAH+20vW9QxR53HYiIDMXEV/wnE0KVcr3t/d70lr
-ImanTrunagV+3O4O
+MSAwHgYJKoZIhvcNAQkBFhFyeUB0aW55Y2xvdWRzLm9yZzCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEAyx7VZwjI1e3d42o7XKHAiRvmR2Bx1otBje47UZEcIMzN
+8/a3j2bJOCgxGiD03Jk3XqPywhjFbPQRf8mkbx25JFSLyCbJXwPv4Tw77u/aZO+W
+o7oS3f6gS7oGB8eWvpraNXr/K5FniDuo9bWfDxzS9x1bP5k1OiUvWpvbmtM9d78C
+AwEAAaMXMBUwEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQEFBQADgYEA
+VdmQOn9K3mDnF7UP8Dvf4YgCe+NdniwYUdJt2FYcO0IT8dYtANBR0IVS0xywz4Kq
+H5osj1I6L6zI8QOmZtRvN1D1NKJInX4uamz3mjYPcdGOFpBbgG+0gwDIFLLCDMU3
+VoutP8TVkm5nVbciBbMYacF4wHG/86as0Ts4drM15cg=
 -----END CERTIFICATE-----
diff --git a/test/fixtures/keys/agent4-csr.pem b/test/fixtures/keys/agent4-csr.pem
index 97e115d0301..9064b757782 100644
--- a/test/fixtures/keys/agent4-csr.pem
+++ b/test/fixtures/keys/agent4-csr.pem
@@ -1,10 +1,13 @@
 -----BEGIN CERTIFICATE REQUEST-----
-MIIBXTCCAQcCAQAwfTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMQswCQYDVQQH
+MIIB4jCCAUsCAQAwfTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMQswCQYDVQQH
 EwJTRjEPMA0GA1UEChMGSm95ZW50MRAwDgYDVQQLEwdOb2RlLmpzMQ8wDQYDVQQD
-EwZhZ2VudDQxIDAeBgkqhkiG9w0BCQEWEXJ5QHRpbnljbG91ZHMub3JnMFwwDQYJ
-KoZIhvcNAQEBBQADSwAwSAJBAM3/Ix+ZDzN2+aOUaTtvcyfrBjYWNoxvhzkQ0lfX
-m/JiEpLXOHHqfSRAifa9/rKobu07k6TPYgmIP1JrTqYroasCAwEAAaAlMCMGCSqG
-SIb3DQEJBzEWExRBIGNoYWxsZW5nZSBwYXNzd29yZDANBgkqhkiG9w0BAQUFAANB
-AMzo7GUOBtGm5MSck1rrEE2C1bU3qoVvXVuiN3A/57zXeNeq24FZMLnkDeL9U+/b
-Kj646XFou04gla982Xp74p0=
+EwZhZ2VudDQxIDAeBgkqhkiG9w0BCQEWEXJ5QHRpbnljbG91ZHMub3JnMIGfMA0G
+CSqGSIb3DQEBAQUAA4GNADCBiQKBgQDLHtVnCMjV7d3jajtcocCJG+ZHYHHWi0GN
+7jtRkRwgzM3z9rePZsk4KDEaIPTcmTdeo/LCGMVs9BF/yaRvHbkkVIvIJslfA+/h
+PDvu79pk75ajuhLd/qBLugYHx5a+mto1ev8rkWeIO6j1tZ8PHNL3HVs/mTU6JS9a
+m9ua0z13vwIDAQABoCUwIwYJKoZIhvcNAQkHMRYTFEEgY2hhbGxlbmdlIHBhc3N3
+b3JkMA0GCSqGSIb3DQEBBQUAA4GBADL43hM8ZGMd0ev7r5iqFQYrLrNXvisWo5vI
+PDBzA7QBkZ4WyDqiUpK75mabmT7cIbnpc05FJV8R35BwafeSReJ7YKd5ru1d1gCn
+yupUNKZ+5+n1mxVxWv+Frgw/Rli1tNua2KcspZLOs99RcrND3YCbcB7TSIotfxmg
+3JtGRloX
 -----END CERTIFICATE REQUEST-----
diff --git a/test/fixtures/keys/agent4-key.pem b/test/fixtures/keys/agent4-key.pem
index b770b015db8..9cdb89067d2 100644
--- a/test/fixtures/keys/agent4-key.pem
+++ b/test/fixtures/keys/agent4-key.pem
@@ -1,9 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIBOQIBAAJBAM3/Ix+ZDzN2+aOUaTtvcyfrBjYWNoxvhzkQ0lfXm/JiEpLXOHHq
-fSRAifa9/rKobu07k6TPYgmIP1JrTqYroasCAwEAAQJAN8RQb+dx1A7rejtdWbfM
-Rww7PD07Oz2eL/a72wgFsdIabRuVypIoHunqV0sAegYtNJt9yu+VhREw0R5tx/qz
-EQIhAPY+nmzp0b4iFRk7mtGUmCTr9iwwzoqzITwphE7FpQnFAiEA1ihUHFT9YPHO
-f85skM6qZv77NEgXHO8NJmQZ5GX1ZK8CICzle+Mluo0tD6W7HV4q9pZ8wzSJbY8S
-W/PpKetm09F1AiAWTw8sAGKAtc/IGo3Oq+iuYAN1F8lolzJsfGMCGujsOwIgAJKP
-t3eXilwX3ZlsDWSklWNZ7iYcfYrvAc3JqU6gFCE=
+MIICXQIBAAKBgQDLHtVnCMjV7d3jajtcocCJG+ZHYHHWi0GN7jtRkRwgzM3z9reP
+Zsk4KDEaIPTcmTdeo/LCGMVs9BF/yaRvHbkkVIvIJslfA+/hPDvu79pk75ajuhLd
+/qBLugYHx5a+mto1ev8rkWeIO6j1tZ8PHNL3HVs/mTU6JS9am9ua0z13vwIDAQAB
+AoGBAMerv8xRblweQIlV3JTqzQH7UxvHSyDEM+T504YTR7tWmP7CASAOwq9ZkytE
+SnCwjSWTtQfooerA4pLj/ajdZyj3JzaTXPahuN/KCZaLPSYLOKHvF7u9larsgnC8
+2Q6jkLJ2TTVqe0w8pc73Ak9A5o2fyjug+BH0KTmr3hcObSXBAkEA6NDv/ofNinJn
+77ELv8k2eVA9psVDWPPapAn2CcEigqBc88L+LM+O1NKDkYgc+ux1QhJa9EWefGJJ
+gPiCdZBOvQJBAN9Y4OOb15txc5C5rduWiGyuCyCFWfdmBrW8oOx+fjG5Q/r7R8eE
++CFepik8BOg+QHjtzY1tzOJkCxObt2PsFisCQQDWzigQTNY8vc/d3Bk+C3VCOuGX
+JHw970g0f6hNWa/wm+sHUUrYp2xeOhkARniOn2qU2oCmzjErDDhLUX503/91AkBg
+3wLDlc9hK0btiatfp53KTX6j/1KzHDxizMqbaI3BcVKL5DsQzZp1lsDI97BFLuL1
+0GasJeiMdMndGlfjbf17AkA2wpV2ui5/3pc6GVFf4DNZvTFxON75b3LRRXQK9TJ+
+JYwP5YSh+/EPI7KCAvpcX37xU7ezGCc7jDxkApiB7H55
 -----END RSA PRIVATE KEY-----
diff --git a/test/fixtures/keys/ca1-cert.pem b/test/fixtures/keys/ca1-cert.pem
index 1951de77a20..a688a76d77a 100644
--- a/test/fixtures/keys/ca1-cert.pem
+++ b/test/fixtures/keys/ca1-cert.pem
@@ -1,15 +1,15 @@
 -----BEGIN CERTIFICATE-----
-MIICazCCAdQCCQDTlFdg2h0DBjANBgkqhkiG9w0BAQUFADB6MQswCQYDVQQGEwJV
+MIICazCCAdQCCQDyB/1ZCqtNHjANBgkqhkiG9w0BAQUFADB6MQswCQYDVQQGEwJV
 UzELMAkGA1UECBMCQ0ExCzAJBgNVBAcTAlNGMQ8wDQYDVQQKEwZKb3llbnQxEDAO
 BgNVBAsTB05vZGUuanMxDDAKBgNVBAMTA2NhMTEgMB4GCSqGSIb3DQEJARYRcnlA
-dGlueWNsb3Vkcy5vcmcwHhcNMTEwMzE0MTgyOTEyWhcNMzgwNzI5MTgyOTEyWjB6
+dGlueWNsb3Vkcy5vcmcwHhcNMTQwNzIzMTk1MTAwWhcNNDExMjA3MTk1MTAwWjB6
 MQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExCzAJBgNVBAcTAlNGMQ8wDQYDVQQK
 EwZKb3llbnQxEDAOBgNVBAsTB05vZGUuanMxDDAKBgNVBAMTA2NhMTEgMB4GCSqG
 SIb3DQEJARYRcnlAdGlueWNsb3Vkcy5vcmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0A
-MIGJAoGBAKxbsLdJbi53pcP1pzg8lgJhLEvcNlV2ogr97WURp+gPjK+HFXj2xl9w
-qDQrxpmvTya+urBG7OagTjV1E7dRE7PTr4TkEqehmxF026Opb0PZewuIBOKX4UgG
-PSfk0fksrje6YJb+OkiBfA/q7eznZF8cmq7MRrs7LWe9A6Bic/apAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADgYEAk6hlYgjCBihG4dM+3324W1WsvjU8QscsTXu8SGL0y9b6
-82zZikj0W9FU6u98WHtXwuFt3mKlGCcou2pluZvj02T2iVKSMs2oYL8JOlvM8hVf
-GEeg2EriLlzmdxNz4/I86DlBiyoTijZh8/qrItsK7+a56P0exH8ouXzlhL1Bhjw=
+MIGJAoGBALlUDB8Via9GfSvlfcIRGS1dr5HMfZz4ZBnHB4HJQbD8TXmNPL5Q5Flc
+AptUsjMPR6WxX4SOcl5NetXYZVNQ9jt7fPaLsWmSNbeICQva0bmgAazqIE3EZonm
+xNVVJ2luqet4D7oOKqS49lGEdpxC6TqayL3t5Zf+/mrSg9AMJTqhAgMBAAEwDQYJ
+KoZIhvcNAQEFBQADgYEAV2DqO9K9IPMD+f5CjWX1ZyklxXwezNacjArETjtMj885
+70+bBGfX2+qnKAIWYh56DwPm3G+3kOqq6lP5njPWkEEOLZnx7R+sSaTVgpkKp4Sh
+E9p8/7eIw7AP5SZgqqVJ9ynyFeMkoY3FG2mwyQHAXHP546zReEHmFxYbFyBCN8I=
 -----END CERTIFICATE-----
diff --git a/test/fixtures/keys/ca1-cert.srl b/test/fixtures/keys/ca1-cert.srl
index 046be14b826..7280b1bcaf5 100644
--- a/test/fixtures/keys/ca1-cert.srl
+++ b/test/fixtures/keys/ca1-cert.srl
@@ -1 +1 @@
-D0F28E241CA7423C
+D0F28E241CA7423D
diff --git a/test/fixtures/keys/ca1-key.pem b/test/fixtures/keys/ca1-key.pem
index a4e4516c623..6f1537b9d8e 100644
--- a/test/fixtures/keys/ca1-key.pem
+++ b/test/fixtures/keys/ca1-key.pem
@@ -1,17 +1,18 @@
------BEGIN ENCRYPTED PRIVATE KEY-----
-MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIrulhMUmafvECAggA
-MBQGCCqGSIb3DQMHBAjsjahmkf3zGwSCAoANt0xX8ZZT2CxeyUadbOuku6NrHoFy
-YBvnEFvuq3TGm3NB72BxprvfMUNR5Xi6e6rJgtRQttPRX6oN2qfB8+W11vFBeFWG
-gxarEotklca4bujPMwxRowyMT20n+yXvRc+Fd5tYrMcaBeweQZD69J242HJMJJmq
-Lzvo2qYGaOxjpc8aUDzeDsv8cnlh5Xk1ZcRucRPM9j26KOPSt0wOd4RdN83AE8cW
-Xu+k5TSMlPQLWihjS+KzEQ8Rs9CuubxrdmecF6DM70u0kYCLZ1Ex7+kBZu06CUpJ
-PODaLca4W92XkBq4X25WgAAaCAj4nZZmgn0X0Fwl1lBqjOK5nEnYpjxuwjjJ2KVz
-3j+kBK5tW6RBE4BM37r7NiM1FAzi8sgNYSVS9oa4m1qGfadEEQdhaMsAfM0SZ/8M
-6NUPKlQmoDda9aCO7rqRuQ7pYQ9mpNxcWEBQi0cG6/3VXtqi/TewAKT1T5DToAzg
-pL4eOTqeDp4VKif5r2u7Nj0EiM4j2TT88onGsdgRtjgUpNmJCRWYaCzs3QZggdYE
-nLZt7ZRXpJ11tERKG3b28qrIw9jHULRAjjWEkEGbxYTpAlrgXklV/04XXnxxAVOP
-0YjDzbfx5QCRCq5UHV4Gl3ELoBaOuxcIIN8YrE2oC1CY9uV/HSk4CSlxHNtWyxbA
-WbCU2SoEHnwBVlTPbZyfErM33c3u4LJyNx6ah7NzMh5AoQ+cPXlzxFBEGIyAmW37
-pItxDNwL1PzXHGpfOM/QZ5wjzGIwXsh8j94jDNB+TIMG4+dm4aXkolevPjJrYAeG
-XZC5mvfMsntNGNFszT/8iXLwt7tlMlQQQl/2b5m6L5yffy6m39wGqTVa
------END ENCRYPTED PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,C8ED255DE57E8907
+
+X4qddPzwn6xPLKHbLPiv4HWhZXGAVOxWyPT8f/9EDpIoWOXt+UmS706knql2uiGN
+MgUAUhmt84WTW3v+2YaO+a6lkiUKY/yMHJjHEMrJLZMp/+DC0oc+yOf3FbQCql6m
+WE1MRUms8sYSAxl/dUXkmkkEfixzfd3Bi6G81iZIXhGDs7OFrKIiyRnuJn7tzXib
+I2gXxsaV/RIbUcWf1ZDKIL072qMlxCj7XmoniYCB21WiR6xAvBGHr5rvbqARqeg8
+4JzbYHwzDCYmAKRsMHo7XxRuwfyP44i36HjNmn2WuNFJIQvVujMWKWkQVr0x1hTK
+wdQGaV4QaWJeRkTzNfJdxbrryRvrPHZKw1apuhuD3SzRWNUPpnUb0dhFw2CpfDhJ
+faIu4yQ0Jep9hZIvJCZdiTUN4ARH4a2Jnj6c0PqxOaTril6SmAtmZ0jQunvNEGEa
+ywdVCaLr19XQzOXbrHVROiqqPVDkIc9zTnirz4MhVMHNxz/f15+/MuXIDWrM3Vgq
+6siUvdxmGsFNM4/k2fwzLn5AqVxqrIrQkXgpYyj6X8GYTQagTHgl83mkG43hWEGi
+91aHQo5tRH/QuJhcHlhOp3NpmcEMCFif7awMsfSJeQ4j8STc7x8purLXwt90Vo/a
+zCNitSIqmlgi3vdV/K0V8Sfp+0JHvXoxGCDjyIiwoGYGI5nUO0TNJvdUzfpw5Mc5
+ekeBgAeH00Qi1iVh4WJr9+KLbpCqPd6CVQ+Ih15fD9hBNI2OkqYFHub+s0mJ0e2V
+Pcl8OTMyITN2JffKj9hzW3jzL/1x//DKeJ9JSlrJeglWmXpo3/lNKA==
+-----END RSA PRIVATE KEY-----
diff --git a/test/fixtures/keys/ca2-cert.pem b/test/fixtures/keys/ca2-cert.pem
index 95e30411f79..106758f41f5 100644
--- a/test/fixtures/keys/ca2-cert.pem
+++ b/test/fixtures/keys/ca2-cert.pem
@@ -1,15 +1,15 @@
 -----BEGIN CERTIFICATE-----
-MIICazCCAdQCCQDVGbMO4Y2VUTANBgkqhkiG9w0BAQUFADB6MQswCQYDVQQGEwJV
+MIICazCCAdQCCQCjhnGuhSJstTANBgkqhkiG9w0BAQUFADB6MQswCQYDVQQGEwJV
 UzELMAkGA1UECBMCQ0ExCzAJBgNVBAcTAlNGMQ8wDQYDVQQKEwZKb3llbnQxEDAO
 BgNVBAsTB05vZGUuanMxDDAKBgNVBAMTA2NhMjEgMB4GCSqGSIb3DQEJARYRcnlA
-dGlueWNsb3Vkcy5vcmcwHhcNMTEwMzE0MTgyOTEyWhcNMzgwNzI5MTgyOTEyWjB6
+dGlueWNsb3Vkcy5vcmcwHhcNMTQwNzIzMTk1MTAwWhcNNDExMjA3MTk1MTAwWjB6
 MQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExCzAJBgNVBAcTAlNGMQ8wDQYDVQQK
 EwZKb3llbnQxEDAOBgNVBAsTB05vZGUuanMxDDAKBgNVBAMTA2NhMjEgMB4GCSqG
 SIb3DQEJARYRcnlAdGlueWNsb3Vkcy5vcmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0A
-MIGJAoGBAMOOtRmmjoBZmyYreB1D1fjftMW6sEGBzfSKZRcn+kiEpqXELq21O/TV
-jLJGbo+0PDqxECQyDbOgoQZXcCevFnFhdsSQOYb+0O2kAiMVYGxDtqoKM5g8wj0D
-BiE6fnyZoQTDv5lEuvfG0+youCtXlxiK/9cfhikI+hVXuTgwQXt9AgMBAAEwDQYJ
-KoZIhvcNAQEFBQADgYEAbMrLydFajwfZXDH3PfpKtDPCm+yV3qvEMGWLfjBdN50g
-PwsZE/OIp+KJttdS+MjMG1TfwfWIqa5zGG2ctxx+fHsKH+t3NsO76Eol1p+dKqZp
-PdFp2UhViMgURkrpP593AsTTO9BGaz+awSaESDHm8pO+cLaeGKQp93W0sgC0lHQ=
+MIGJAoGBAOnywgPgUUTRrhZmcIV15zLXdozaMZLD3FNwleJMUF6j1BqsfvfSFv6A
+LGEJ/boM5pqXC89eIYDkIUUSNp5OJBl1ZrHvjjkoiFNUPpGHxezP2d5Tl7xU01V9
+MsUHZWDeeHxR/BdS9f0EpBe9dCBCC9SeqPOma8YXjdb8B1OM9JBrAgMBAAEwDQYJ
+KoZIhvcNAQEFBQADgYEAVmx9jU0qPT/R/bkWhs4LKDOGCiVDhA+fk+0Jl2l1ixH7
+XUaRwO7O9L9FomraM9De7K7+/gwThY/Hc9cMu6kwdipSM9FQVvfNWL/d4jQ4EoVQ
+mIyC455QW0+xVU4adALRV6xBrn/DpF8lBTIyyt5fHKfve8Cmxm1MeVK0fNnTuT8=
 -----END CERTIFICATE-----
diff --git a/test/fixtures/keys/ca2-cert.srl b/test/fixtures/keys/ca2-cert.srl
index 00dca7dcd0f..dfa171924f0 100644
--- a/test/fixtures/keys/ca2-cert.srl
+++ b/test/fixtures/keys/ca2-cert.srl
@@ -1 +1 @@
-8306BE7DE1BB099A
+8306BE7DE1BB099C
diff --git a/test/fixtures/keys/ca2-crl.pem b/test/fixtures/keys/ca2-crl.pem
index 166df745833..e9a5fb33b18 100644
--- a/test/fixtures/keys/ca2-crl.pem
+++ b/test/fixtures/keys/ca2-crl.pem
@@ -1,10 +1,10 @@
 -----BEGIN X509 CRL-----
-MIIBXTCBxzANBgkqhkiG9w0BAQQFADB6MQswCQYDVQQGEwJVUzELMAkGA1UECBMC
+MIIBeTCB4zANBgkqhkiG9w0BAQQFADB6MQswCQYDVQQGEwJVUzELMAkGA1UECBMC
 Q0ExCzAJBgNVBAcTAlNGMQ8wDQYDVQQKEwZKb3llbnQxEDAOBgNVBAsTB05vZGUu
 anMxDDAKBgNVBAMTA2NhMjEgMB4GCSqGSIb3DQEJARYRcnlAdGlueWNsb3Vkcy5v
-cmcXDTExMDMxNDE4MjkxNloXDTEzMTIwNzE4MjkxNlowHDAaAgkAgwa+feG7CZoX
-DTExMDMxNDE4MjkxNFowDQYJKoZIhvcNAQEEBQADgYEArRKuEkOla61fm4zlZtHe
-LTXFV0Hgo21PScHAp6JqPol4rN5R9+EmUkv7gPCVVBJ9VjIgxSosHiLsDiz3zR+u
-txHemhzbdIVANAIiChnFct8sEqH2eL4N6XNUIlMIR06NjNl7NbN8w8haqiearnuT
-wmnaL4TThPmpbpKAF7N7JqQ=
+cmcXDTE0MDcyMzE5NTEwMFoXDTE3MDQxNzE5NTEwMFowODAaAgkAgwa+feG7CZoX
+DTExMDMxNDE4MjkxNFowGgIJAIMGvn3huwmcFw0xNDA3MjMxOTUxMDBaMA0GCSqG
+SIb3DQEBBAUAA4GBANjskxPFHIYOxYD6q42o6wJqHZx5mvslAOhWxkMqwQGu5Z6i
+zcKsdbD/l4F+SWB1iXMeQGxxKU4zqcjzo8N2YM9aNzGERqaGueIYu7ghN2n+80Sq
+ce5xwjRHxTTq6I1PQArDyuoG4yRAeZBr9uKYtyXsYeZq1EdLooFbUAkPRB+Z
 -----END X509 CRL-----
diff --git a/test/fixtures/keys/ca2-database.txt b/test/fixtures/keys/ca2-database.txt
index a0966d2697a..ed2c19f652e 100644
--- a/test/fixtures/keys/ca2-database.txt
+++ b/test/fixtures/keys/ca2-database.txt
@@ -1 +1,2 @@
 R	380729182912Z	110314182914Z	8306BE7DE1BB099A	unknown	/C=US/ST=CA/L=SF/O=Joyent/OU=Node.js/CN=agent4/emailAddress=ry@tinyclouds.org
+R	411207195100Z	140723195100Z	8306BE7DE1BB099C	unknown	/C=US/ST=CA/L=SF/O=Joyent/OU=Node.js/CN=agent4/emailAddress=ry@tinyclouds.org
diff --git a/test/fixtures/keys/ca2-key.pem b/test/fixtures/keys/ca2-key.pem
index 49f678a351c..aea047eed9d 100644
--- a/test/fixtures/keys/ca2-key.pem
+++ b/test/fixtures/keys/ca2-key.pem
@@ -1,17 +1,18 @@
------BEGIN ENCRYPTED PRIVATE KEY-----
-MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIbhsCgrscf9MCAggA
-MBQGCCqGSIb3DQMHBAjz0LdWOB2KVQSCAoDu+sHRLP6v6QiEwqynnF43yP02/F+8
-Jssz6cgFPpm4MWm+xwzvMsS4ET0UYE68OTZz/QgihwH0mp/34tkUnP0HqtdbnTH1
-fkG47hb8fVSEyDQSzs1ha/u31GIachNURKyhWR5mr15AJxu2B94Z3ldNv1yjI+Fy
-M1muuyx/cdkKTdpfpYr6n//wF1tup2u8Y7nkKsFus/mCuRlpItxKcRb1+nvW0s+K
-3bSR8CTlEWd1Tx6Qx+ogRbP8gwqd6gelcz/Zj8nInx/Y0gTkQ4eodmLJ5iqsvC36
-SgQB5LuP12ujTyXB3Hwqb8LJ4lULERX6AYHAa7h0c+fxuFr0W9/8atplrd22hoiP
-zZhgPHeH3R1fibB4M4xW2xgtbysOHj74RYlhQm1TCXLlqvzKkvT2oQ1bk7tUUqoR
-ozRxVzdL9oKWLzvR4LF8S67i35JlnOPU1AhcxD2+5ywRvTpugPyCE1mZOeVLHlGW
-2pdmSKbdd2gm2iSfadDPJ1DPdHLp844jRg/D6XDs4rlBnt9FjMWaXYo+ELmokoYe
-Yljv2MGfy6zsb5iKcNsx+llu04xGXfZ9BAuG+aT6DLCIcDIVvE0d6asc4Lz1xZli
-BrgyB8el2a/PomPbbf1vI2vtDi3Rg/pQhu/2++ODI08jI9Rudz1EltQQ4Lo38Ton
-nSZegTAy6afXiEh2ty09KxMo4sWs+F2I46e5Q3zGY9b/K19bbQTFxeBf2Rfwa8BF
-cf8Xs+DlcOMz5w0U2iBQfT1cV7dWLlaop7avYkpQ0fLa1pConlNhpguezcaAB8Lb
-VCfpoTh6VfHRtCLokQlkq0mlKPUSlMr/JAyVdvppp/T6Abt0VirM9ILV
------END ENCRYPTED PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,EE51F4BF188048BF
+
+r/NJ5tr2nsCWRuDEuElhG238GeC+EO2rLw0HEacCToZmfGmExSLLB7xxFIMzy7Bd
+ccu8S39AtnHfFEs87Zi5cy6WKk7PZt5ll5gE7kfzDjEl/zx6aQbXsNkOE1d4HDr9
+fWfAbm1AwnXU0A93kIJco5P8fUZ4RoHbEndI/gnFv7coAZi4ivZBvAkFEdtEx4Ok
+WVTz3wSB0gg6/wkfdbVv435e1YByJz79jZKpLHarc0k0W6l+/2KcR22mCQ+3USBz
+xytbNhFwEiBnmp/zfP9ggFZt0ZYXb7r2Ddpc7hUIolA3wTlyjKHjYLcPzOl1PTQU
+dAHzKXN5QuXx++Mm6S3G/xo/f5PQOs1WKEWoCi3VPf/JrpuRaHimqXp5oEEugCCz
+J3YfIUu05cRBP22jT9n6IsXxtQIbZGcYzhVIenzw6K4O3Cn73iWjJVtfKVePLsF5
+cozx4ozrY2uIc9F2nvP9gA28YizArK4Dv5Q0Jt77YZR2aB6A7z0qhtQl/Omzs9/S
+ddvbysa98S9xb3okWo6/5bmG3cIIhbr/60L0P6+HwKJROZ4zAQh3LLmiGe7gKpJM
+ozqgxAYFUD56lkuUJnhdFoPonkVPZ1hBdBMQymECdfVL+WwWjZ8ZFghclhu932T4
+7Nmp30fQORUld7/PIdAc/wKk4x2IoTcRW/HY73QUwO/BCw/g3YUVqB7G8keh8Mcv
+XOdWaQSebtxJ41SnFZfDUTBvGHrmr22YZJeU0gtiJdQR5m86ZG8h9tNK8wXWzNkn
+VKMf4M1tTrdr4Uhhoeh3A38zCs0Pa+JopsoWuFjDNteBdYAeopYY2A==
+-----END RSA PRIVATE KEY-----
diff --git a/test/simple/test-tls-server-verify.js b/test/simple/test-tls-server-verify.js
index 2b09d821636..377f95b6ba0 100644
--- a/test/simple/test-tls-server-verify.js
+++ b/test/simple/test-tls-server-verify.js
@@ -19,11 +19,10 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+var common = require('../common');
 
-
-
-if (!process.versions.openssl) {
-  console.error('Skipping because node compiled without OpenSSL.');
+if (!common.opensslCli) {
+  console.error('Skipping because node compiled without OpenSSL CLI.');
   process.exit(0);
 }
 
@@ -179,7 +178,8 @@ function runClient(options, cb) {
   }
 
   // To test use: openssl s_client -connect localhost:8000
-  var client = spawn('openssl', args);
+  console.log(common.opensslCli, args);
+  var client = spawn(common.opensslCli, args);
 
   var out = '';