diff --git a/test/ca/certindex b/test/ca/certindex
index 08a4bc9ad..e3abd88b0 100644
--- a/test/ca/certindex
+++ b/test/ca/certindex
@@ -2,3 +2,4 @@ V	150407190456Z		0A	unknown	/CN=testco.internal/ST=California/C=US/emailAddress=
 V	150407194146Z		0B	unknown	/CN=testco.internal/ST=California/C=US/emailAddress=test@testco.com/O=TestCo/OU=Beta
 V	150526223338Z		0C	unknown	/CN=*.testco.internal/ST=California/C=US/emailAddress=test@testco.com/O=TestCo/OU=Beta
 V	160526220537Z		0D	unknown	/CN=test.internal/ST=CA/C=US/emailAddress=test@internal.com/O=HashiCorp Test Cert/OU=Dev
+V	170604185910Z		0E	unknown	/CN=testco.internal/ST=California/C=US/emailAddress=test@testco.com/O=Hashicorp Test Cert/OU=Beta
diff --git a/test/ca/serialfile b/test/ca/serialfile
index ff470b05e..0ced2f35e 100644
--- a/test/ca/serialfile
+++ b/test/ca/serialfile
@@ -1 +1 @@
-0E
+0F
diff --git a/test/key/ourdomain.cer b/test/key/ourdomain.cer
index 84a43bd64..447cd3710 100644
--- a/test/key/ourdomain.cer
+++ b/test/key/ourdomain.cer
@@ -1,22 +1,23 @@
 -----BEGIN CERTIFICATE-----
-MIIDujCCAqKgAwIBAgIBDTANBgkqhkiG9w0BAQUFADCBmDELMAkGA1UEBhMCVVMx
+MIIDwzCCAqugAwIBAgIBDjANBgkqhkiG9w0BAQUFADCBmDELMAkGA1UEBhMCVVMx
 CzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRwwGgYDVQQKExNI
 YXNoaUNvcnAgVGVzdCBDZXJ0MQwwCgYDVQQLEwNEZXYxFjAUBgNVBAMTDXRlc3Qu
-aW50ZXJuYWwxIDAeBgkqhkiG9w0BCQEWEXRlc3RAaW50ZXJuYWwuY29tMB4XDTE1
-MDUyNzIyMDUzN1oXDTE2MDUyNjIyMDUzN1owgYAxFjAUBgNVBAMTDXRlc3QuaW50
-ZXJuYWwxCzAJBgNVBAgTAkNBMQswCQYDVQQGEwJVUzEgMB4GCSqGSIb3DQEJARYR
-dGVzdEBpbnRlcm5hbC5jb20xHDAaBgNVBAoTE0hhc2hpQ29ycCBUZXN0IENlcnQx
-DDAKBgNVBAsTA0RldjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAr66LvaDv
-yeOvqjYSaZbSVevMNykzFkouY7NFJvXwlwozh7xpCQO6oiDyn2xpVwVkfghZrotC
-Ib4KURp+I6N91qEpksLmWcp3rkvZNPF1OaarfOhVilh/BTDIGhpX9OFMovqqtnhM
-QpcN3kwePPV5CH2nb0Ki5y4IS8/QYpU2VjUCAwEAAaOBqDCBpTAJBgNVHRMEAjAA
-MB0GA1UdDgQWBBSxjn8VZCgHU3JSYMZLkJG5aMqw4TAfBgNVHSMEGDAWgBSj+es5
-+q9t57ZWSVUogWXJARu4lTALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMCwGA1UdHwQlMCMwIaAfoB2GG2h0dHA6Ly9wYXRoLnRvLmNy
-bC9teWNhLmNybDANBgkqhkiG9w0BAQUFAAOCAQEAmKrgLSbsrhN1f49lyfrFF5n0
-/wvuis45aXHRf4Ovn3IzwWJkRezGvwIDwJez9tRc61rjDR85HPVioqvp6cbk+6CE
-og0XPLxxu4vs+BsXn1O3mdNc/qux5P1uszC1TJMvzk3vXE4/zXnsfmYMQ1u/sc53
-4AsXUDvGzCiUWkOCAPWkBCVHOwZwst9Ut3cpZLvXwS2ck42k1Np2DtZvG1GsBlVW
-fjiG4IG7uDoQtAp+Z0RQtqew5I82WqGJuAajkx4jOh7XAqdNYdiqJNOqQl7IJvOm
-KmZ2TPx6qoR8aIiYmJs3Jx5xdXWdNZLCbm75pHGSaZUXge9/wG/mc9RMkmVNtg==
+aW50ZXJuYWwxIDAeBgkqhkiG9w0BCQEWEXRlc3RAaW50ZXJuYWwuY29tMB4XDTE2
+MDYwNDE4NTkxMFoXDTE3MDYwNDE4NTkxMFowgYkxGDAWBgNVBAMTD3Rlc3Rjby5p
+bnRlcm5hbDETMBEGA1UECBMKQ2FsaWZvcm5pYTELMAkGA1UEBhMCVVMxHjAcBgkq
+hkiG9w0BCQEWD3Rlc3RAdGVzdGNvLmNvbTEcMBoGA1UEChMTSGFzaGljb3JwIFRl
+c3QgQ2VydDENMAsGA1UECxMEQmV0YTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkC
+gYEAzNCiwaIhJ26tqXzmwB+oJzstp41X8ygpsywCOzEuHgD+Dck2CLOhlJHmqO3b
+sHfv87g3HtdJaF1tO1PQqdHxpJS3vyogUuP8iy6rHgkGtExWgsRxILtbpfzyG1Rt
+TgO4pg7uOlCe1p5oDNnHj1YTgmhtRpB0x054DdSvjKVHY5UCAwEAAaOBqDCBpTAJ
+BgNVHRMEAjAAMB0GA1UdDgQWBBTHULSXbpeHHFM+lq/HYq8m38a00TAfBgNVHSME
+GDAWgBSj+es5+q9t57ZWSVUogWXJARu4lTALBgNVHQ8EBAMCBaAwHQYDVR0lBBYw
+FAYIKwYBBQUHAwEGCCsGAQUFBwMCMCwGA1UdHwQlMCMwIaAfoB2GG2h0dHA6Ly9w
+YXRoLnRvLmNybC9teWNhLmNybDANBgkqhkiG9w0BAQUFAAOCAQEAjJKtWTVyFk7u
+WGQlXHRBgt0/qWjnHzVOXcVJxaL1uuddhY1mOsmHxuvbM5SqfvnyRf1Dbvmm4y+E
+8hNn9lESmQKRiq1XX2H0/K8AXfNIglqLCB+Fx5GgLJ8jboDsuJsq7SxYHVj4NIOY
+9gf83cwxpxAV9JuR9izBIs7afP75MvjjuveLgIpyNzbdCt9/71WQY3Wt0epYRWLD
+DGeP4zEBR6KMu3vILWX3kRlpvX1OcfqvcRpzpNRDmpzzMwOHQBtBp3/7lf43yGLg
+ZxWuUzWCN5RXZZHhsSNqlplXjcyCEyAPTxiE0hbAKhAJeWjadnUJ88SC41bGjDor
+FU3JVe6aqw==
 -----END CERTIFICATE-----
diff --git a/test/key/ourdomain.csr b/test/key/ourdomain.csr
index 5da7d6ae5..149827cb3 100644
--- a/test/key/ourdomain.csr
+++ b/test/key/ourdomain.csr
@@ -1,12 +1,13 @@
 -----BEGIN CERTIFICATE REQUEST-----
-MIIB2TCCAUICAQAwgZgxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UE
-BxMNU2FuIEZyYW5jaXNjbzEcMBoGA1UEChMTSGFzaGlDb3JwIFRlc3QgQ2VydDEM
-MAoGA1UECxMDRGV2MRYwFAYDVQQDEw10ZXN0LmludGVybmFsMSAwHgYJKoZIhvcN
-AQkBFhF0ZXN0QGludGVybmFsLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkC
-gYEAr66LvaDvyeOvqjYSaZbSVevMNykzFkouY7NFJvXwlwozh7xpCQO6oiDyn2xp
-VwVkfghZrotCIb4KURp+I6N91qEpksLmWcp3rkvZNPF1OaarfOhVilh/BTDIGhpX
-9OFMovqqtnhMQpcN3kwePPV5CH2nb0Ki5y4IS8/QYpU2VjUCAwEAAaAAMA0GCSqG
-SIb3DQEBBQUAA4GBAK7eNcgM/DLtSh+6CqntHMT0mQ5PZB3xjsDQ1qMo2OHPbISI
-7ULzCRpYLmvD5fgypjlEf8GT5+H9bXrJT14hlUG8FYRr3vx+9LNjA2Tp/JsLQEM+
-zzfF59JvVcsViQ/vqw17uk3ODvjToQDnNj7S6DB1Y3PhRf9wmdZFn1vVR5by
+MIIB4DCCAUkCAQAwgZ8xCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlh
+MRQwEgYDVQQHEwtMb3MgQW5nZWxlczEcMBoGA1UEChMTSGFzaGljb3JwIFRlc3Qg
+Q2VydDENMAsGA1UECxMEQmV0YTEYMBYGA1UEAxMPdGVzdGNvLmludGVybmFsMR4w
+HAYJKoZIhvcNAQkBFg90ZXN0QHRlc3Rjby5jb20wgZ8wDQYJKoZIhvcNAQEBBQAD
+gY0AMIGJAoGBAMzQosGiISdural85sAfqCc7LaeNV/MoKbMsAjsxLh4A/g3JNgiz
+oZSR5qjt27B37/O4Nx7XSWhdbTtT0KnR8aSUt78qIFLj/Isuqx4JBrRMVoLEcSC7
+W6X88htUbU4DuKYO7jpQntaeaAzZx49WE4JobUaQdMdOeA3Ur4ylR2OVAgMBAAGg
+ADANBgkqhkiG9w0BAQUFAAOBgQBvz0CFO6td/cc6MzyWXNgfiYqdvDvq9JoEvROS
+CG6ZsOAJc15ePw9px4wYK2fQZQVZkSWl0vpIZNnIWAdQboAKAQmfnE6CPHc+5ePJ
+LxFIL2vG/4UYnKdbR2dxSpNxyfF59tXwVDS6qeietaZz596F2D3cBwBflxJcK2nD
+JkTOOA==
 -----END CERTIFICATE REQUEST-----
diff --git a/test/key/ourdomain.key b/test/key/ourdomain.key
index 105bb5972..9e033369e 100644
--- a/test/key/ourdomain.key
+++ b/test/key/ourdomain.key
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQCvrou9oO/J46+qNhJpltJV68w3KTMWSi5js0Um9fCXCjOHvGkJ
-A7qiIPKfbGlXBWR+CFmui0IhvgpRGn4jo33WoSmSwuZZyneuS9k08XU5pqt86FWK
-WH8FMMgaGlf04Uyi+qq2eExClw3eTB489XkIfadvQqLnLghLz9BilTZWNQIDAQAB
-AoGAZLDL0uG8zZ+7/PiE0RPqdehx4WOxriLSN7518gCf5lGoezGXmd0TSP1NUeZW
-8dNbZ4jtrcaPHrvHOfjPNynrYvdWUaa7jetWsIAiiiL/zfw74sr+YieTMy0Rk2Mn
-0URbHKmMYaqmvJb/pXHWJESACGcoo3hYAnnz179jpoLzaHkCQQDXkW++l7C0c40b
-qvVaJNZCGDLaTUpa3gRTGY04DDYVTukjWsRpIKz7IU59um9eVzJlsaaby8Z3LQH6
-cg8QAWmLAkEA0KH1Nc5c7LXuTH+U3lSz13FlZ+Rdqk7p4fFyeeOvVp0eF1C90apU
-J+IsC8IumKuftlRIJcKfGWsw1v6gBqG3PwJAB6Jl87kJkAp7l9xBHjUpxWN4AZU1
-Keys+IhyIOcFz1FhHlhrllGK7sXqMre0lAHAjitxfBkGaVgVttntQKLcKwJAJsfU
-IrpHP6DZuNKGQ4WPIF7tsJAccQnWI6+TzeBquTjfXQofHpgAqKE7+ruPmcVdHLEx
-8ALrO/hWzb/q0xDAVQJATvGQLzpaiojli5zrglbiFpJIIZOSAfNkvAanuQnAMJxO
-5kIkV29BiTi+KsfuYHsXV3/6ADOEFuOlKDUKYlf6Cw==
+MIICXQIBAAKBgQDM0KLBoiEnbq2pfObAH6gnOy2njVfzKCmzLAI7MS4eAP4NyTYI
+s6GUkeao7duwd+/zuDce10loXW07U9Cp0fGklLe/KiBS4/yLLqseCQa0TFaCxHEg
+u1ul/PIbVG1OA7imDu46UJ7WnmgM2cePVhOCaG1GkHTHTngN1K+MpUdjlQIDAQAB
+AoGAJY4oGdtRuvpHa6mUYiwr2C24vF1lgBegNdNfAV2OOEA0VXDMsKHHggeSxO0A
+eIY1gHoJ2WTed/2RluxSeaEebpwNp1e2V+JpJRVAF+PNBGng1WMIlK81vC6zZspm
+AKe9O3XQZmIGKw1YyTOmYERAImjAarP0sKRAjkdfRTHEEcECQQD1W6ZtCJQvdDC/
+GKKEOUzIB8l/hUAQSHc0pEhctLWU1VnFGfhFFRnUr2FFrbnF5gvvz8GdQtEXXuzX
+9NSlnrblAkEA1bLQNwRz77ZQoMHme/E13ITDoBl+YUWZVN7+n0DkUgu6JdRsmYh6
+nAIcoAS0CjxyNoPssDshdjyLcMxuT27+8QJAYCYEN+IOv/HWUGyE8y/JKPH0Qmaj
+Tj43iIeAW+Ps7GAXB6g/pEK6lqALjFSh4i1eLCHMC6Ztba0jPxWQZz6lCQJBAJfD
+oQmhmPChyssQSa62FGlixEecM1vDgOx8XdodzMjT2URqgyHagjDvcwLVtEMcwIQk
+1uAlblM5FlJqbODu1BECQQC71WumyTo9/9Z9QR67WRd0yE1JHs3HUUvzw4JFNkRs
+n0Tu7GZHDdzLaSodtC47tPJfYkdJwxBr20+RSCzF3VZF
 -----END RSA PRIVATE KEY-----