diff --git a/bogo/check.py b/bogo/check.py
index 02b587d6..ba75420a 100644
--- a/bogo/check.py
+++ b/bogo/check.py
@@ -1,6 +1,7 @@
 import re
 import json
 import fnmatch
+import sys
 
 config = json.load(open('config.json'))
 test_error_set = set(config['TestErrorMap'].keys())
@@ -12,7 +13,7 @@ unimpl_tests = set()
 disabled_tests = set()
 passed_tests = set()
 
-for line in open('out'):
+for line in sys.stdin:
     m = re.match('^(PASSED|UNIMPLEMENTED|FAILED|DISABLED) \((.*)\)$', line.strip())
     if m:
         status, name = m.groups()
diff --git a/bogo/config.json b/bogo/config.json
index 4ffae34f..7976e1d7 100644
--- a/bogo/config.json
+++ b/bogo/config.json
@@ -9,12 +9,14 @@
     "*-TLS11": "",
     "ConflictingVersionNegotiation": "",
     "SendFallbackSCSV": "fallback scsv not implemented",
-    "VersionNegotiation-*-TLS13Draft22-TLS13Experiment2": "no old drafts",
     "PointFormat-Server-Missing": "we require ecc",
     "ECDSAKeyUsage-*": "TODO: we don't do anything with key usages",
     "CheckRecordVersion-*": "we don't look at record version",
     "TLS13-WrongOuterRecord": "we're lax on this",
     "*DTLS*": "not supported",
+    "TokenBinding-*": "not supported",
+    "QUICTransportParams-*": "not supported",
+    "DummyPQPadding-*": "not supported",
     "MTU*": "dtls only",
     "DisableEverything": "not useful",
     "SendEmptyRecords": "non-standard openssl/boringssl behaviour",
@@ -23,7 +25,9 @@
     "SendWarningAlerts-*": "",
     "LargeMessage-Reject": "",
     "Peek-*": "",
-    "SendHelloRetryRequest-2-TLS13Draft22": "we accept any supported keyshare",
+    "*-Split": "",
+    "EchoTLS13CompatibilitySessionID": "",
+    "SendHelloRetryRequest-2-TLS13Draft23": "we accept any supported keyshare",
     "OmitExtensions-ServerHello-TLS12": "bug in bogo if sct offered",
     "EmptyExtensions-ServerHello-TLS12": "",
     "CBCRecordSplitting*": "insane ciphersuites",
@@ -37,12 +41,16 @@
     "*-AES256-SHA*": "",
     "*-ECDSA-SHA1-*": "no ecdsa-sha1",
     "*-Sign-RSA-PKCS1-SHA1-*": "no sha1",
+    "*-P-224-*": "no p224",
     "*-P521-*": "no p521",
-    "*-P-521": "",
-    "*-P-224": "no p224",
-    "*-P-224-*": "",
-    "CurveTest-Client-P-521-TLS13": "",
-    "CurveTest-Server-P-521-TLS13": "",
+    "CurveTest-Client-P-521-TLS12": "",
+    "CurveTest-Server-P-521-TLS12": "",
+    "CurveTest-Client-Compressed-P-521-TLS12": "",
+    "CurveTest-Server-Compressed-P-521-TLS12": "",
+    "CurveTest-Client-P-521-TLS13Draft23": "",
+    "CurveTest-Server-P-521-TLS13Draft23": "",
+    "CurveTest-Client-Compressed-P-521-TLS13Draft23": "",
+    "CurveTest-Server-Compressed-P-521-TLS13Draft23": "",
     "*-Ed25519": "no ed25519 yet",
     "*-Ed25519-*": "",
     "GREASE-*": "not implemented",
@@ -115,9 +123,9 @@
     "TrailingMessageData-TLS13-ServerFinished": ":DECRYPTION_FAILED_OR_BAD_RECORD_MAC:",
     "TrailingMessageData-TLS13-ClientCertificate": ":BAD_HANDSHAKE_MSG:",
     "TrailingMessageData-TLS13-ClientCertificateVerify": ":BAD_HANDSHAKE_MSG:",
-    "MissingKeyShare-Client-TLS13Draft22": ":PEER_MISBEHAVIOUR:",
-    "MissingKeyShare-Server-TLS13Draft22": ":INCOMPATIBLE:",
-    "EmptyEncryptedExtensions-TLS13Draft22": ":BAD_HANDSHAKE_MSG:",
+    "MissingKeyShare-Client-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
+    "MissingKeyShare-Server-TLS13Draft23": ":INCOMPATIBLE:",
+    "EmptyEncryptedExtensions-TLS13Draft23": ":BAD_HANDSHAKE_MSG:",
     "NoSupportedCurves": ":INCOMPATIBLE:",
     "BadECDHECurve": ":PEER_MISBEHAVIOUR:",
     "VersionTooLow": ":INCOMPATIBLE:",
@@ -137,51 +145,51 @@
     "NoNullCompression-TLS12": ":INCOMPATIBLE:",
     "NoNullCompression-TLS13": ":INCOMPATIBLE:",
     "InvalidCompressionMethod": ":PEER_MISBEHAVIOUR:",
-    "TLS13Draft22-InvalidCompressionMethod": ":PEER_MISBEHAVIOUR:",
-    "TLS13Draft22-AES128-GCM-server": ":INCOMPATIBLE:",
-    "TLS13Draft22-AES128-GCM-client": ":PEER_MISBEHAVIOUR:",
-    "TLS13Draft22-AES256-GCM-server": ":INCOMPATIBLE:",
-    "TLS13Draft22-AES256-GCM-client": ":PEER_MISBEHAVIOUR:",
-    "TLS13Draft22-ECDHE-ECDSA-AES128-GCM-client": ":PEER_MISBEHAVIOUR:",
-    "TLS13Draft22-ECDHE-ECDSA-AES256-GCM-client": ":PEER_MISBEHAVIOUR:",
-    "TLS13Draft22-ECDHE-ECDSA-CHACHA20-POLY1305-client": ":PEER_MISBEHAVIOUR:",
-    "TLS13Draft22-ECDHE-RSA-AES128-GCM-server": ":INCOMPATIBLE:",
-    "TLS13Draft22-ECDHE-RSA-AES128-GCM-client": ":PEER_MISBEHAVIOUR:",
-    "TLS13Draft22-ECDHE-RSA-AES256-GCM-server": ":INCOMPATIBLE:",
-    "TLS13Draft22-ECDHE-RSA-AES256-GCM-client": ":PEER_MISBEHAVIOUR:",
-    "TLS13Draft22-ECDHE-RSA-CHACHA20-POLY1305-server": ":INCOMPATIBLE:",
-    "TLS13Draft22-ECDHE-RSA-CHACHA20-POLY1305-client": ":PEER_MISBEHAVIOUR:",
+    "TLS13Draft23-InvalidCompressionMethod": ":PEER_MISBEHAVIOUR:",
+    "TLS13Draft23-AES128-GCM-server": ":INCOMPATIBLE:",
+    "TLS13Draft23-AES128-GCM-client": ":PEER_MISBEHAVIOUR:",
+    "TLS13Draft23-AES256-GCM-server": ":INCOMPATIBLE:",
+    "TLS13Draft23-AES256-GCM-client": ":PEER_MISBEHAVIOUR:",
+    "TLS13Draft23-ECDHE-ECDSA-AES128-GCM-client": ":PEER_MISBEHAVIOUR:",
+    "TLS13Draft23-ECDHE-ECDSA-AES256-GCM-client": ":PEER_MISBEHAVIOUR:",
+    "TLS13Draft23-ECDHE-ECDSA-CHACHA20-POLY1305-client": ":PEER_MISBEHAVIOUR:",
+    "TLS13Draft23-ECDHE-RSA-AES128-GCM-server": ":INCOMPATIBLE:",
+    "TLS13Draft23-ECDHE-RSA-AES128-GCM-client": ":PEER_MISBEHAVIOUR:",
+    "TLS13Draft23-ECDHE-RSA-AES256-GCM-server": ":INCOMPATIBLE:",
+    "TLS13Draft23-ECDHE-RSA-AES256-GCM-client": ":PEER_MISBEHAVIOUR:",
+    "TLS13Draft23-ECDHE-RSA-CHACHA20-POLY1305-server": ":INCOMPATIBLE:",
+    "TLS13Draft23-ECDHE-RSA-CHACHA20-POLY1305-client": ":PEER_MISBEHAVIOUR:",
     "TLS12-AEAD-CHACHA20-POLY1305-server": ":INCOMPATIBLE:",
     "TLS12-AEAD-CHACHA20-POLY1305-client": ":PEER_MISBEHAVIOUR:",
     "TLS12-AEAD-AES128-GCM-SHA256-server": ":INCOMPATIBLE:",
     "TLS12-AEAD-AES128-GCM-SHA256-client": ":PEER_MISBEHAVIOUR:",
     "TLS12-AEAD-AES256-GCM-SHA384-server": ":INCOMPATIBLE:",
     "TLS12-AEAD-AES256-GCM-SHA384-client": ":PEER_MISBEHAVIOUR:",
-    "SkipHelloRetryRequest-TLS13Draft22": ":PEER_MISBEHAVIOUR:",
+    "SkipHelloRetryRequest-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
     "NoSupportedVersions": ":INCOMPATIBLE:",
-    "ClientAuth-Verify-RSA-PKCS1-SHA1-TLS13Draft22": ":PEER_MISBEHAVIOUR:",
-    "ServerAuth-Verify-RSA-PKCS1-SHA1-TLS13Draft22": ":PEER_MISBEHAVIOUR:",
-    "ClientAuth-Verify-RSA-PKCS1-SHA256-TLS13Draft22": ":PEER_MISBEHAVIOUR:",
-    "ServerAuth-Verify-RSA-PKCS1-SHA256-TLS13Draft22": ":PEER_MISBEHAVIOUR:",
-    "ClientAuth-Verify-RSA-PKCS1-SHA384-TLS13Draft22": ":PEER_MISBEHAVIOUR:",
-    "ServerAuth-Verify-RSA-PKCS1-SHA384-TLS13Draft22": ":PEER_MISBEHAVIOUR:",
-    "ClientAuth-Verify-RSA-PKCS1-SHA512-TLS13Draft22": ":PEER_MISBEHAVIOUR:",
-    "ServerAuth-Verify-RSA-PKCS1-SHA512-TLS13Draft22": ":PEER_MISBEHAVIOUR:",
-    "ServerAuth-Sign-RSA-PKCS1-SHA256-TLS13Draft22": ":INCOMPATIBLE:",
-    "ServerAuth-Sign-RSA-PKCS1-SHA384-TLS13Draft22": ":INCOMPATIBLE:",
-    "ServerAuth-Sign-RSA-PKCS1-SHA512-TLS13Draft22": ":INCOMPATIBLE:",
-    "ClientAuth-Sign-RSA-PKCS1-SHA256-TLS13Draft22": ":INCOMPATIBLE:",
-    "ClientAuth-Sign-RSA-PKCS1-SHA384-TLS13Draft22": ":INCOMPATIBLE:",
-    "ClientAuth-Sign-RSA-PKCS1-SHA512-TLS13Draft22": ":INCOMPATIBLE:",
-    "ALPNClient-EmptyProtocolName-TLS13Draft22": ":PEER_MISBEHAVIOUR:",
-    "ALPNServer-EmptyProtocolName-TLS13Draft22": ":PEER_MISBEHAVIOUR:",
-    "ALPNClient-RejectUnknown-TLS13Draft22": ":PEER_MISBEHAVIOUR:",
+    "ClientAuth-Verify-RSA-PKCS1-SHA1-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
+    "ServerAuth-Verify-RSA-PKCS1-SHA1-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
+    "ClientAuth-Verify-RSA-PKCS1-SHA256-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
+    "ServerAuth-Verify-RSA-PKCS1-SHA256-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
+    "ClientAuth-Verify-RSA-PKCS1-SHA384-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
+    "ServerAuth-Verify-RSA-PKCS1-SHA384-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
+    "ClientAuth-Verify-RSA-PKCS1-SHA512-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
+    "ServerAuth-Verify-RSA-PKCS1-SHA512-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
+    "ServerAuth-Sign-RSA-PKCS1-SHA256-TLS13Draft23": ":INCOMPATIBLE:",
+    "ServerAuth-Sign-RSA-PKCS1-SHA384-TLS13Draft23": ":INCOMPATIBLE:",
+    "ServerAuth-Sign-RSA-PKCS1-SHA512-TLS13Draft23": ":INCOMPATIBLE:",
+    "ClientAuth-Sign-RSA-PKCS1-SHA256-TLS13Draft23": ":INCOMPATIBLE:",
+    "ClientAuth-Sign-RSA-PKCS1-SHA384-TLS13Draft23": ":INCOMPATIBLE:",
+    "ClientAuth-Sign-RSA-PKCS1-SHA512-TLS13Draft23": ":INCOMPATIBLE:",
+    "ALPNClient-EmptyProtocolName-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
+    "ALPNServer-EmptyProtocolName-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
+    "ALPNClient-RejectUnknown-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
     "ClientAuth-NoFallback-TLS13": ":INCOMPATIBLE:",
     "ServerAuth-NoFallback-TLS13": ":INCOMPATIBLE:",
     "ClientAuth-Enforced-TLS13": ":PEER_MISBEHAVIOUR:",
     "ServerAuth-Enforced-TLS13": ":PEER_MISBEHAVIOUR:",
-    "SecondClientHelloWrongCurve-TLS13Draft22": ":PEER_MISBEHAVIOUR:",
-    "SecondClientHelloMissingKeyShare-TLS13Draft22": ":INCOMPATIBLE:",
+    "SecondClientHelloWrongCurve-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
+    "SecondClientHelloMissingKeyShare-TLS13Draft23": ":INCOMPATIBLE:",
     "Resume-Server-BinderWrongLength": ":PEER_MISBEHAVIOUR:",
     "Resume-Server-NoPSKBinder": ":PEER_MISBEHAVIOUR:",
     "Resume-Server-ExtraPSKBinder": ":PEER_MISBEHAVIOUR:",
@@ -192,61 +200,61 @@
     "Resume-Server-UnofferedCipher-TLS13": ":PEER_MISBEHAVIOUR:",
     "Resume-Client-CipherMismatch-TLS13": ":PEER_MISBEHAVIOUR:",
     "Resume-Client-PRFMismatch-TLS13": ":PEER_MISBEHAVIOUR:",
-    "Resume-Client-Mismatch-TLS12-TLS13Draft22": ":PEER_MISBEHAVIOUR:",
-    "Resume-Client-Mismatch-TLS13Draft22-TLS12": ":PEER_MISBEHAVIOUR:",
+    "Resume-Client-Mismatch-TLS12-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
+    "Resume-Client-Mismatch-TLS13Draft23-TLS12": ":PEER_MISBEHAVIOUR:",
     "NoSupportedCurves-TLS13": ":INCOMPATIBLE:",
     "BadECDHECurve-TLS13": ":PEER_MISBEHAVIOUR:",
     "InvalidECDHPoint-Client-TLS13": ":PEER_MISBEHAVIOUR:",
     "InvalidECDHPoint-Server-TLS13": ":PEER_MISBEHAVIOUR:",
-    "InvalidPSKIdentity-TLS13Draft22": ":PEER_MISBEHAVIOUR:",
-    "AlwaysSelectPSKIdentity-TLS13Draft22": ":PEER_MISBEHAVIOUR:",
-    "TrailingKeyShareData-TLS13Draft22": ":BAD_HANDSHAKE_MSG:",
-    "HelloRetryRequestCurveMismatch-TLS13Draft22": ":PEER_MISBEHAVIOUR:",
-    "HelloRetryRequestVersionMismatch-TLS13Draft22": ":BAD_HANDSHAKE_MSG:",
-    "HelloRetryRequest-DuplicateCookie-TLS13Draft22": ":PEER_MISBEHAVIOUR:",
-    "HelloRetryRequest-DuplicateCurve-TLS13Draft22": ":PEER_MISBEHAVIOUR:",
+    "InvalidPSKIdentity-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
+    "AlwaysSelectPSKIdentity-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
+    "TrailingKeyShareData-TLS13Draft23": ":BAD_HANDSHAKE_MSG:",
+    "HelloRetryRequestCurveMismatch-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
+    "HelloRetryRequestVersionMismatch-TLS13Draft23": ":BAD_HANDSHAKE_MSG:",
+    "HelloRetryRequest-DuplicateCookie-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
+    "HelloRetryRequest-DuplicateCurve-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
     "UnknownUnencryptedExtension-Client-TLS13": ":PEER_MISBEHAVIOUR:",
     "UnexpectedUnencryptedExtension-Client-TLS13": ":PEER_MISBEHAVIOUR:",
     "UnofferedExtension-Client-TLS13": ":PEER_MISBEHAVIOUR:",
     "RenegotiationInfo-Forbidden-TLS13": ":PEER_MISBEHAVIOUR:",
     "UnknownExtension-Client-TLS13": ":PEER_MISBEHAVIOUR:",
-    "RequestContextInHandshake-TLS13Draft22": ":BAD_HANDSHAKE_MSG:",
-    "UnnecessaryHelloRetryRequest-TLS13Draft22": ":PEER_MISBEHAVIOUR:",
-    "UnknownCurve-HelloRetryRequest-TLS13Draft22": ":PEER_MISBEHAVIOUR:",
-    "DisabledCurve-HelloRetryRequest-TLS13Draft22": ":PEER_MISBEHAVIOUR:",
-    "HelloRetryRequest-Empty-TLS13Draft22": ":PEER_MISBEHAVIOUR:",
-    "HelloRetryRequest-EmptyCookie-TLS13Draft22": ":PEER_MISBEHAVIOUR:",
-    "HelloRetryRequest-Unknown-TLS13Draft22": ":INCOMPATIBLE:",
-    "MinimumVersion-Client-TLS13Draft22-TLS12": ":INCOMPATIBLE:",
-    "MinimumVersion-Client2-TLS13Draft22-TLS12": ":INCOMPATIBLE:",
-    "MinimumVersion-Server-TLS13Draft22-TLS12": ":INCOMPATIBLE:",
-    "MinimumVersion-Server2-TLS13Draft22-TLS12": ":INCOMPATIBLE:",
-    "DuplicateKeyShares-TLS13Draft22": ":PEER_MISBEHAVIOUR:",
+    "RequestContextInHandshake-TLS13Draft23": ":BAD_HANDSHAKE_MSG:",
+    "UnnecessaryHelloRetryRequest-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
+    "UnknownCurve-HelloRetryRequest-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
+    "DisabledCurve-HelloRetryRequest-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
+    "HelloRetryRequest-Empty-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
+    "HelloRetryRequest-EmptyCookie-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
+    "HelloRetryRequest-Unknown-TLS13Draft23": ":INCOMPATIBLE:",
+    "MinimumVersion-Client-TLS13Draft23-TLS12": ":INCOMPATIBLE:",
+    "MinimumVersion-Client2-TLS13Draft23-TLS12": ":INCOMPATIBLE:",
+    "MinimumVersion-Server-TLS13Draft23-TLS12": ":INCOMPATIBLE:",
+    "MinimumVersion-Server2-TLS13Draft23-TLS12": ":INCOMPATIBLE:",
+    "DuplicateKeyShares-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
     "PartialEncryptedExtensionsWithServerHello": ":PEER_MISBEHAVIOUR:",
     "PartialClientFinishedWithClientHello": ":PEER_MISBEHAVIOUR:",
     "PointFormat-EncryptedExtensions-TLS13": ":PEER_MISBEHAVIOUR:",
     "Ticket-Forbidden-TLS13": ":PEER_MISBEHAVIOUR:",
     "PointFormat-Server-MissingUncompressed": ":INCOMPATIBLE:",
-    "MissingSignatureAlgorithmsInCertificateRequest-TLS13Draft22": ":INCOMPATIBLE:",
-    "NegotiatePSKResumption-TLS13Draft22": ":PEER_MISBEHAVIOUR:",
+    "MissingSignatureAlgorithmsInCertificateRequest-TLS13Draft23": ":INCOMPATIBLE:",
+    "NegotiatePSKResumption-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
     "PointFormat-Client-MissingUncompressed": ":PEER_MISBEHAVIOUR:",
     "SendUnsolicitedOCSPOnCertificate-TLS13": ":PEER_MISBEHAVIOUR:",
     "SendUnsolicitedSCTOnCertificate-TLS13": ":PEER_MISBEHAVIOUR:",
     "UnsolicitedServerNameAck-TLS12": ":PEER_MISBEHAVIOUR:",
-    "UnsolicitedServerNameAck-TLS13Draft22": ":PEER_MISBEHAVIOUR:",
+    "UnsolicitedServerNameAck-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
     "TicketSessionIDLength-33-TLS12": ":BAD_HANDSHAKE_MSG:",
     "Ed25519DefaultDisable-NoAccept": ":PEER_MISBEHAVIOUR:",
     "SendUnknownExtensionOnCertificate-TLS13": ":PEER_MISBEHAVIOUR:",
     "SendDuplicateExtensionsOnCerts-TLS13": ":PEER_MISBEHAVIOUR:",
     "SignedCertificateTimestampListEmpty-Client-TLS12": ":PEER_MISBEHAVIOUR:",
-    "SignedCertificateTimestampListEmpty-Client-TLS13Draft22": ":PEER_MISBEHAVIOUR:",
+    "SignedCertificateTimestampListEmpty-Client-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
     "SignedCertificateTimestampListEmptySCT-Client-TLS12": ":PEER_MISBEHAVIOUR:",
-    "SignedCertificateTimestampListEmptySCT-Client-TLS13Draft22": ":PEER_MISBEHAVIOUR:",
+    "SignedCertificateTimestampListEmptySCT-Client-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
     "EMS-Forbidden-TLS13": ":PEER_MISBEHAVIOUR:",
     "Unclean-Shutdown": ":CLOSE_WITHOUT_CLOSE_NOTIFY:",
     "SendExtensionOnClientCertificate-TLS13": ":PEER_MISBEHAVIOUR:",
     "SendBogusAlertType": ":BAD_ALERT:",
-    "TLS13Draft22-HRR-InvalidCompressionMethod": ":BAD_HANDSHAKE_MSG:",
+    "TLS13Draft23-HRR-InvalidCompressionMethod": ":BAD_HANDSHAKE_MSG:",
     "CertificateCipherMismatch-RSA": ":PEER_MISBEHAVIOUR:",
     "CertificateCipherMismatch-ECDSA": ":PEER_MISBEHAVIOUR:",
     "ServerCipherFilter-RSA": ":INCOMPATIBLE:",
@@ -254,8 +262,16 @@
     "TLS13-OnlyPadding": ":PEER_MISBEHAVIOUR:",
     "TLS13-EmptyRecords": ":PEER_MISBEHAVIOUR:",
     "SupportedVersionSelection-TLS12": ":PEER_MISBEHAVIOUR:",
-    "HelloRetryRequestVersionMismatch-TLS13Draft22": ":INCOMPATIBLE:",
-    "HelloRetryRequest-CipherChange-TLS13Draft22": ":PEER_MISBEHAVIOUR:",
+    "HelloRetryRequestVersionMismatch-TLS13Draft23": ":INCOMPATIBLE:",
+    "HelloRetryRequest-CipherChange-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
+    "CurveTest-Client-Compressed-P-256-TLS12": ":PEER_MISBEHAVIOUR:",
+    "CurveTest-Server-Compressed-P-256-TLS12": ":PEER_MISBEHAVIOUR:",
+    "CurveTest-Client-Compressed-P-256-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
+    "CurveTest-Server-Compressed-P-256-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
+    "CurveTest-Client-Compressed-P-384-TLS12": ":PEER_MISBEHAVIOUR:",
+    "CurveTest-Server-Compressed-P-384-TLS12": ":PEER_MISBEHAVIOUR:",
+    "CurveTest-Client-Compressed-P-384-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
+    "CurveTest-Server-Compressed-P-384-TLS13Draft23": ":PEER_MISBEHAVIOUR:",
     "ExtendedMasterSecret-NoToYes-Client": ":PEER_MISBEHAVIOUR:",
     "ExtendedMasterSecret-YesToNo-Server": ":PEER_MISBEHAVIOUR:",
     "ExtendedMasterSecret-YesToNo-Client": ":PEER_MISBEHAVIOUR:"
@@ -263,6 +279,6 @@
   "TestLocalErrorMap": {
     "SendServerHelloAsHelloRetryRequest": "remote error: error decoding message",
     "GarbageCertificate-Server-TLS12": "remote error: access denied",
-    "GarbageCertificate-Server-TLS13Draft22": "remote error: access denied"
+    "GarbageCertificate-Server-TLS13Draft23": "remote error: access denied"
   }
 }
diff --git a/examples/internal/bogo_shim.rs b/examples/internal/bogo_shim.rs
index 2a445bf5..ad002664 100644
--- a/examples/internal/bogo_shim.rs
+++ b/examples/internal/bogo_shim.rs
@@ -577,6 +577,7 @@ fn main() {
             "-no-tls11" |
             "-no-tls1" |
             "-no-ssl3" |
+            "-handoff" |
             "-decline-alpn" |
             "-expect-no-session" |
             "-expect-session-miss" |