diff --git a/test/ossl_shim/ossl_config.json b/test/ossl_shim/ossl_config.json
index cdde095347..50433ed107 100644
--- a/test/ossl_shim/ossl_config.json
+++ b/test/ossl_shim/ossl_config.json
@@ -45,10 +45,6 @@
         "BadECDSA-4-1":"Test failure - reason unknown",
         "BadECDSA-4-4":"Test failure - reason unknown",
         "BadECDSA-4-3":"Test failure - reason unknown",
-        "NoClientCertificate-Server-SSL3":"Test failure - reason unknown",
-        "NoClientCertificate-Server-TLS1":"Test failure - reason unknown",
-        "NoClientCertificate-Server-TLS11":"Test failure - reason unknown",
-        "NoClientCertificate-Server-TLS12":"Test failure - reason unknown",
         "SillyDH":"Test failure - reason unknown",
         "VersionNegotiationExtension-TLS1-DTLS":"Test failure - reason unknown",
         "NoSupportedVersions-DTLS":"Test failure - reason unknown",
@@ -158,29 +154,15 @@
         "PointFormat-Client-MissingUncompressed":"Test failure - reason unknown",
         "PointFormat-Server-MissingUncompressed":"Test failure - reason unknown",
         "Basic-Client-RenewTicket-Sync":"Test failure - reason unknown",
-        "CertificateVerificationSucceed-Server-SSL3-Sync":"Test failure - reason unknown",
-        "CertificateVerificationSucceed-Server-TLS1-Sync":"Test failure - reason unknown",
-        "CertificateVerificationSucceed-Server-TLS11-Sync":"Test failure - reason unknown",
-        "CertificateVerificationSucceed-Server-TLS12-Sync":"Test failure - reason unknown",
         "Renegotiate-Client-Sync":"Test failure - reason unknown",
         "Shutdown-Shim-Sync":"Test failure - reason unknown",
         "Basic-Client-RenewTicket-Sync-SplitHandshakeRecords":"Test failure - reason unknown",
-        "CertificateVerificationSucceed-Server-SSL3-Sync-SplitHandshakeRecords":"Test failure - reason unknown",
-        "CertificateVerificationSucceed-Server-TLS1-Sync-SplitHandshakeRecords":"Test failure - reason unknown",
-        "CertificateVerificationSucceed-Server-TLS11-Sync-SplitHandshakeRecords":"Test failure - reason unknown",
-        "CertificateVerificationSucceed-Server-TLS12-Sync-SplitHandshakeRecords":"Test failure - reason unknown",
         "Renegotiate-Client-Sync-SplitHandshakeRecords":"Test failure - reason unknown",
         "Shutdown-Shim-Sync-SplitHandshakeRecords":"Test failure - reason unknown",
         "Basic-Client-RenewTicket-Sync-PackHandshakeFlight":"Test failure - reason unknown",
-        "CertificateVerificationSucceed-Server-SSL3-Sync-PackHandshakeFlight":"Test failure - reason unknown",
-        "CertificateVerificationSucceed-Server-TLS1-Sync-PackHandshakeFlight":"Test failure - reason unknown",
-        "CertificateVerificationSucceed-Server-TLS11-Sync-PackHandshakeFlight":"Test failure - reason unknown",
-        "CertificateVerificationSucceed-Server-TLS12-Sync-PackHandshakeFlight":"Test failure - reason unknown",
         "Renegotiate-Client-Sync-PackHandshakeFlight":"Test failure - reason unknown",
         "Shutdown-Shim-Sync-PackHandshakeFlight":"Test failure - reason unknown",
         "Basic-Client-RenewTicket-DTLS-Sync":"Test failure - reason unknown",
-        "CertificateVerificationSucceed-Server-TLS1-DTLS-Sync":"Test failure - reason unknown",
-        "CertificateVerificationSucceed-Server-TLS12-DTLS-Sync":"Test failure - reason unknown",
         "Basic-Client-RenewTicket-DTLS-Sync-SplitHandshakeRecords":"Test failure - reason unknown",
         "Basic-Server-Implicit-DTLS-Sync-SplitHandshakeRecords":"Test failure - reason unknown",
         "ClientAuth-NoCertificate-Server-DTLS-Sync-SplitHandshakeRecords":"Test failure - reason unknown",
@@ -188,29 +170,13 @@
         "Basic-Server-RSA-DTLS-Sync-SplitHandshakeRecords":"Test failure - reason unknown",
         "Basic-Server-ECDHE-RSA-DTLS-Sync-SplitHandshakeRecords":"Test failure - reason unknown",
         "Basic-Server-ECDHE-ECDSA-DTLS-Sync-SplitHandshakeRecords":"Test failure - reason unknown",
-        "CertificateVerificationSucceed-Server-TLS1-DTLS-Sync-SplitHandshakeRecords":"Test failure - reason unknown",
-        "CertificateVerificationSucceed-Server-TLS12-DTLS-Sync-SplitHandshakeRecords":"Test failure - reason unknown",
         "Basic-Client-RenewTicket-Async":"Test failure - reason unknown",
-        "CertificateVerificationSucceed-Server-SSL3-Async":"Test failure - reason unknown",
-        "CertificateVerificationSucceed-Server-TLS1-Async":"Test failure - reason unknown",
-        "CertificateVerificationSucceed-Server-TLS11-Async":"Test failure - reason unknown",
-        "CertificateVerificationSucceed-Server-TLS12-Async":"Test failure - reason unknown",
         "Shutdown-Shim-Async":"Test failure - reason unknown",
         "Basic-Client-RenewTicket-Async-SplitHandshakeRecords":"Test failure - reason unknown",
-        "CertificateVerificationSucceed-Server-SSL3-Async-SplitHandshakeRecords":"Test failure - reason unknown",
-        "CertificateVerificationSucceed-Server-TLS1-Async-SplitHandshakeRecords":"Test failure - reason unknown",
-        "CertificateVerificationSucceed-Server-TLS11-Async-SplitHandshakeRecords":"Test failure - reason unknown",
-        "CertificateVerificationSucceed-Server-TLS12-Async-SplitHandshakeRecords":"Test failure - reason unknown",
         "Shutdown-Shim-Async-SplitHandshakeRecords":"Test failure - reason unknown",
         "Basic-Client-RenewTicket-Async-PackHandshakeFlight":"Test failure - reason unknown",
-        "CertificateVerificationSucceed-Server-SSL3-Async-PackHandshakeFlight":"Test failure - reason unknown",
-        "CertificateVerificationSucceed-Server-TLS1-Async-PackHandshakeFlight":"Test failure - reason unknown",
-        "CertificateVerificationSucceed-Server-TLS11-Async-PackHandshakeFlight":"Test failure - reason unknown",
-        "CertificateVerificationSucceed-Server-TLS12-Async-PackHandshakeFlight":"Test failure - reason unknown",
         "Shutdown-Shim-Async-PackHandshakeFlight":"Test failure - reason unknown",
         "Basic-Client-RenewTicket-DTLS-Async":"Test failure - reason unknown",
-        "CertificateVerificationSucceed-Server-TLS1-DTLS-Async":"Test failure - reason unknown",
-        "CertificateVerificationSucceed-Server-TLS12-DTLS-Async":"Test failure - reason unknown",
         "Basic-Client-RenewTicket-DTLS-Async-SplitHandshakeRecords":"Test failure - reason unknown",
         "Basic-Server-Implicit-DTLS-Async-SplitHandshakeRecords":"Test failure - reason unknown",
         "ClientAuth-NoCertificate-Server-DTLS-Async-SplitHandshakeRecords":"Test failure - reason unknown",
@@ -218,8 +184,6 @@
         "Basic-Server-RSA-DTLS-Async-SplitHandshakeRecords":"Test failure - reason unknown",
         "Basic-Server-ECDHE-RSA-DTLS-Async-SplitHandshakeRecords":"Test failure - reason unknown",
         "Basic-Server-ECDHE-ECDSA-DTLS-Async-SplitHandshakeRecords":"Test failure - reason unknown",
-        "CertificateVerificationSucceed-Server-TLS1-DTLS-Async-SplitHandshakeRecords":"Test failure - reason unknown",
-        "CertificateVerificationSucceed-Server-TLS12-DTLS-Async-SplitHandshakeRecords":"Test failure - reason unknown",
         "SendUnencryptedFinished-DTLS":"Test failure - reason unknown",
         "PartialEncryptedExtensionsWithServerHello":"Test failure - reason unknown",
         "StrayChangeCipherSpec":"Test failure - reason unknown",