diff --git a/test/ca/certindex b/test/ca/certindex
index f24bb0886f..08a4bc9ad9 100644
--- a/test/ca/certindex
+++ b/test/ca/certindex
@@ -1,3 +1,4 @@
 V	150407190456Z		0A	unknown	/CN=testco.internal/ST=California/C=US/emailAddress=test@testco.com/O=TestCo/OU=Beta
 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
diff --git a/test/ca/serialfile b/test/ca/serialfile
index 8af8809acf..ff470b05e5 100644
--- a/test/ca/serialfile
+++ b/test/ca/serialfile
@@ -1 +1 @@
-0D
+0E
diff --git a/test/key/ourdomain.cer b/test/key/ourdomain.cer
index c3a8946df5..84a43bd64a 100644
--- a/test/key/ourdomain.cer
+++ b/test/key/ourdomain.cer
@@ -1,22 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIDtzCCAp+gAwIBAgIBDDANBgkqhkiG9w0BAQUFADCBmDELMAkGA1UEBhMCVVMx
+MIIDujCCAqKgAwIBAgIBDTANBgkqhkiG9w0BAQUFADCBmDELMAkGA1UEBhMCVVMx
 CzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRwwGgYDVQQKExNI
 YXNoaUNvcnAgVGVzdCBDZXJ0MQwwCgYDVQQLEwNEZXYxFjAUBgNVBAMTDXRlc3Qu
-aW50ZXJuYWwxIDAeBgkqhkiG9w0BCQEWEXRlc3RAaW50ZXJuYWwuY29tMB4XDTE0
-MDUyNjIyMzMzOFoXDTE1MDUyNjIyMzMzOFowfjEaMBgGA1UEAxQRKi50ZXN0Y28u
-aW50ZXJuYWwxEzARBgNVBAgTCkNhbGlmb3JuaWExCzAJBgNVBAYTAlVTMR4wHAYJ
-KoZIhvcNAQkBFg90ZXN0QHRlc3Rjby5jb20xDzANBgNVBAoTBlRlc3RDbzENMAsG
-A1UECxMEQmV0YTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA4x6514o05YIc
-qeurGljZ4GUfN1QxLZpak3HakL/u0nTiOvp17huaIjLShXz2ue2OhjtSc3XOAyTE
-iaqN2eKQ+NOh/JjEfprRW1uUazA62zfTrJIcN/+cns9w6THPqgly3vrIcc1nQlCq
-i2afjpzwvb+sTENybT1qqpWo7CiwPKMCAwEAAaOBqDCBpTAJBgNVHRMEAjAAMB0G
-A1UdDgQWBBTPWuJjRGdhZgJblG4A5oglODsgDTAfBgNVHSMEGDAWgBSj+es5+q9t
-57ZWSVUogWXJARu4lTALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-CCsGAQUFBwMCMCwGA1UdHwQlMCMwIaAfoB2GG2h0dHA6Ly9wYXRoLnRvLmNybC9t
-eWNhLmNybDANBgkqhkiG9w0BAQUFAAOCAQEAiMI0plrXGPLayVM/TsBn4JIa0xIb
-IPIAffMZHvjSn7nsPnn8H+Lii8D6vt2jx/46R6YUcEijDXBV9MsJ8uIRGHkv3B+B
-UsmB5paA0YQO75zxL/M1JvLN+MbN8/2TFZmOgARLxxTC8vXOHHqzm4ajRhZCv9bb
-EWwcZFu23uqA3YEGfwRec4MhazzLZ2azI9E4NBEJNCdyOqk56YESjotpbrv0yaag
-iBzFnZcT9CcLqpC/WBPLwoeuQrZZANtcUhpamO4RLknyn04oSwIT5MBy9xYdlopT
-r/5EDJViejLkB5kn322tt79WXH/ZmLRNfeIrs5PTrnENJYz7nNDp1yIeRw==
+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==
 -----END CERTIFICATE-----
diff --git a/test/key/ourdomain.csr b/test/key/ourdomain.csr
index e68015de7c..5da7d6ae55 100644
--- a/test/key/ourdomain.csr
+++ b/test/key/ourdomain.csr
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE REQUEST-----
-MIIBvjCCAScCAQAwfjELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWEx
-DzANBgNVBAoTBlRlc3RDbzENMAsGA1UECxMEQmV0YTEaMBgGA1UEAxQRKi50ZXN0
-Y28uaW50ZXJuYWwxHjAcBgkqhkiG9w0BCQEWD3Rlc3RAdGVzdGNvLmNvbTCBnzAN
-BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA4x6514o05YIcqeurGljZ4GUfN1QxLZpa
-k3HakL/u0nTiOvp17huaIjLShXz2ue2OhjtSc3XOAyTEiaqN2eKQ+NOh/JjEfprR
-W1uUazA62zfTrJIcN/+cns9w6THPqgly3vrIcc1nQlCqi2afjpzwvb+sTENybT1q
-qpWo7CiwPKMCAwEAAaAAMA0GCSqGSIb3DQEBBQUAA4GBADYNANLRORU5zO5qCTZ5
-m8jXfkVX2fDbiG5rdVbd9V4cYQ8/eulPmX/TZzY5qNuoT2zJZcOwrJWGtMofZra6
-4kb5qNCNWHEUfVBM6WXi9rFO55DD83T9NsBxbi09QltqUNja6ueeLkJHgphpxXuU
-1CJ8IOFdH/a1zETHO917GHii
+MIIB2TCCAUICAQAwgZgxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UE
+BxMNU2FuIEZyYW5jaXNjbzEcMBoGA1UEChMTSGFzaGlDb3JwIFRlc3QgQ2VydDEM
+MAoGA1UECxMDRGV2MRYwFAYDVQQDEw10ZXN0LmludGVybmFsMSAwHgYJKoZIhvcN
+AQkBFhF0ZXN0QGludGVybmFsLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkC
+gYEAr66LvaDvyeOvqjYSaZbSVevMNykzFkouY7NFJvXwlwozh7xpCQO6oiDyn2xp
+VwVkfghZrotCIb4KURp+I6N91qEpksLmWcp3rkvZNPF1OaarfOhVilh/BTDIGhpX
+9OFMovqqtnhMQpcN3kwePPV5CH2nb0Ki5y4IS8/QYpU2VjUCAwEAAaAAMA0GCSqG
+SIb3DQEBBQUAA4GBAK7eNcgM/DLtSh+6CqntHMT0mQ5PZB3xjsDQ1qMo2OHPbISI
+7ULzCRpYLmvD5fgypjlEf8GT5+H9bXrJT14hlUG8FYRr3vx+9LNjA2Tp/JsLQEM+
+zzfF59JvVcsViQ/vqw17uk3ODvjToQDnNj7S6DB1Y3PhRf9wmdZFn1vVR5by
 -----END CERTIFICATE REQUEST-----
diff --git a/test/key/ourdomain.key b/test/key/ourdomain.key
index 10d61d1301..105bb59723 100644
--- a/test/key/ourdomain.key
+++ b/test/key/ourdomain.key
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQDjHrnXijTlghyp66saWNngZR83VDEtmlqTcdqQv+7SdOI6+nXu
-G5oiMtKFfPa57Y6GO1Jzdc4DJMSJqo3Z4pD406H8mMR+mtFbW5RrMDrbN9Oskhw3
-/5yez3DpMc+qCXLe+shxzWdCUKqLZp+OnPC9v6xMQ3JtPWqqlajsKLA8owIDAQAB
-AoGBAJZEwQ7z2VW0hYSDcbzH5rfKECJKaRNUGfOOE99Lrha+0OPWzOoShyNzXsiF
-SrTvkSoM29uaqQh5bjPrjVkIx4MrWcGX6LHH62e/AhraasNOd/goYET8LAYupAkg
-Fydm2xhWdVFxHnHAreNsiEfal+yWe7vCPGHS46xLaYrj3xJJAkEA9YBj00FXSdla
-GA3sGyuZzxrzWkkG9pI54rkYNEMPFbYR2rSK4sUG4RP5mstqFrU8lnbdMLKAxYfm
-vQfnzje6/wJBAOzVGxpEcCM2Vyza7eJOSxcTGNkHcGrPPB5l9DZlfqqVwGetOLmA
-f3dQB2HU1klLIBAJ1PyoCTyMZr8qk52Usl0CQBkqZhE7u3TogOHCW5eVapjeTF/O
-6JXR+3kQPDjvPtac6UugAjSoucHMyGNjwqY9Qc6ytI3PXn/hJHfwHYT4FYUCQQCj
-hGvHEhOerEk6RhpS0x3TW7MfPZynklf+4QPhfuga3XRP4PC2W3smpNHEAVDGoCEO
-EcvFejuOW54hRUNQXLddAkEA1UERffW+WS/4waNcg2Qs69O7G1vQShlrwnI5ds27
-1QMnb6NdKm8LKREqfND9Qt/Wptk5O4kgPwB6qsQE7D/dow==
+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==
 -----END RSA PRIVATE KEY-----