diff --git a/ncat/test/ncat-test.pl b/ncat/test/ncat-test.pl
index d040c3070..af494ac45 100755
--- a/ncat/test/ncat-test.pl
+++ b/ncat/test/ncat-test.pl
@@ -260,11 +260,11 @@ sub server_client_test_multi {
 # Like server_client_test, but run the test once each for each mix of TCP, UDP,
 # SCTP, and SSL.
 sub server_client_test_all {
-	server_client_test_multi(["tcp", "udp", "sctp", "tcp ssl", "sctp ssl"], @_);
+	server_client_test_multi(["tcp", "udp", "udp ssl", "sctp", "tcp ssl", "sctp ssl"], @_);
 }
 
 sub server_client_test_tcp_sctp_ssl {
-	server_client_test_multi(["tcp", "sctp", "tcp ssl", "sctp ssl"], @_);
+	server_client_test_multi(["tcp", "sctp", "udp ssl", "tcp ssl", "sctp ssl"], @_);
 }
 
 sub server_client_test_tcp_ssl {
diff --git a/ncat/test/test-cert.pem b/ncat/test/test-cert.pem
index a64fc2f3e..a65fcf0b7 100644
--- a/ncat/test/test-cert.pem
+++ b/ncat/test/test-cert.pem
@@ -1,47 +1,47 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQChGGUWUm7QUE2Z
-xBNaKuz7eSuR6LkGhhc5kzwRp4BqbUzHkdKr8glFeyP8Vmqszp+pKcdVahFE9WH3
-/mWk1Vuu8dGf6omhDwdzkqzASnSK8XDYYs8wWZycgewRkzJ2ZWqkN0MjiVnek4XV
-jcom6ZxQb000V0/rpkzcmHfzatnkSo6cIjiF/Yk886bulMFwbtQ69KPtg/7jNgPE
-N2me8nzSRW6cdBKcFR9tSJ196W5CxZzL7dUDitk+mUwghsCVhAygCUEMsAxlzZsv
-Rio6Hx5Jjaoeb3ZrWJSrQP11MNQ6aXYWHYPKFQrJlWqvmUdPNUNZA5UJg3jWZj89
-/UkTYrmLAgMBAAECggEBAIeyKNRYs4c9XWB8zWBScDSTqKPLSK+6G64f26VzVrRP
-RTGGH9M+mZixVWqk0E6n7c1sp7/HDKztlYxz+eKS5hvDDjSKN0w3gKtVjbacAPdY
-0Rk0ghnUIhujRNq5BvS8EMwq0J8Kf20BDucH/JQyi70lQ/8m3Oc+udfHhqLACrJE
-1R/8hRKasqRChA7YytC8W9KUEJHiThCVeMO5ljg+nfV3ElCnVm9WZI3YY6LjHJ5b
-xJt0XxHFK3fpwrHc+9FT8n1A2eKQhojZrfmZqMvpwqQ5tGdRfiXWYWKahnyCqQZU
-EOF4pvjtq4JCRJtdTbdO+SO6/gYIGBnSKFX6SRmCHsECgYEAzRVUpQkvyRKVLpp6
-vy4d3D1bmeQJETorpteQWH6u8mJT1SiTxr4DTjcK1FSwNhT1L5YWuaIbcy5N9cRc
-CVCOx9ynVpvlmVGXbGWCpO8thC8kHS4C0o6meN7Hdc4XlvhnsP6lXVx0+IiYkO97
-DAkcNfYq9VCCfwxShSint0u6gkMCgYEAyRdGypoOoW8bj5oHYKZWn6nUTvUeQYI4
-AbrpKvmyHziy7A3nDXR20bFsZLzwIx5cWXC2IgxnV67PxJBKx6zC8eqGVQvtOXoL
-+EZclDx7X/qPuOV9cGQC0g90+vEMtho7Y0+OOMjnX4Mp5Mxe0MKsHBVPJXV+J9au
-HzbEQgS+axkCgYAfY8dr50cQIK8CzhRBlN5vKlkN6fBVWbD6vX3TfbhrUw9/zdEo
-l0bMPvKCY2ABNx38JZ3e1egbrheyqVZo+pKQFr7qK7xtxiZGKhdgBVfTJqABc1xt
-O/ZRA9BFwMCtk+HTHnbTHmas78NiU7VitzZBMCeNGsCOj6VFyl45WPb4HwKBgFlK
-0a9zOx3qBVX9slrzYbGiKtkotNen6BC0m4buu25rsd9pyPhLh9tTKmuNDiC6AY3h
-o654zYa85BtHaz1A9IuRdTbchekozZngPInCVZJn41vZ45p9flcib/JiCR/vhAF0
-ORXz9/GMf5TOPyf52Yza1XsvseYkyMqpefpKuvc5AoGBALdY8Eq/GQzHCWQtGnrC
-J1FF9FdmnRFx3eoCktFQHrYTXg0NDAUykTENoHTHiXpm8AGZIe2amMQdFxIO6xQl
-mb9QDUWe9pw0CkDIjrcqq5qSoZP7fkdKxPDrM4nK78Mxl7TiZiEZ66LNV4L3DL3y
-Icb8eZxcfAFT0vH4cAjIgjG3
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC9V/Za8PvlqNoe
+spf0lFFic8NPNFnijZEAfmC6q0L7lJmpwCkpNOdbkzmMwKy00PGEt4lKfbhxOc0s
+YcSoDEGY/4LWSc7GcrIl943Mf8raEJMHHY9mEw8nXEML5O65hgTTN6CQPzjpWjpt
+7jo380SR4PwBWGjCot1oA6jvbbFU2HQlSujHVkRwI+6mQhuyP69ex5u9jPFKEoXy
+27iNCeABzm31TkOQiKHdyOqVQvyhjB93CDaK8ihRAQpNJ+RGeXVVXEdag/f+RB+R
+GK1cfUU6bIpRszZiz0QVLQijHjoRT8iuOV5SoE/hnblkwqOzsmdWTsRTy04DD2yB
+L90j+WvhAgMBAAECggEAOSn3XJlo03tY7u+oZNTqhTjB/IWnpXhsEKQW/AR8oovI
+oLE9PA2W09TtCQuamLSEVjc7Idw29SgoQ3/46WtZ2qE5lQyPeuZh1oiYrObgDVn3
+qaxJAN48Mvvt2gdx81z80+/1b9dGjV0KSuojdYTibNBqBNX2Ot0Ez0Rbmn2Zji2O
+YfUAW4xb7Qw9VjU28bYwGnrCfxVEI6z7ggVw+yMm0vfQxMKZuJc9GVT0yhezFGPm
+AGTcY5dRY8mir1DetqiZFjP8OQKvMI8gbCdMbWV7dXGleek/oRB6PGJRTS+KJnAP
+vmrBUH3p3UjMq810euU8gjSQJmI32id5j4DCrD2CAQKBgQDdseNnGNT6rIUNbzGi
+nwkuwnvkz43wPmSUnNpMoKXfhkALZ4yy3R34EsJjIAAPDHvy6JRIvQ/Vc3uxRnlh
+lN+qb+ZX2DMXY+tK+xWi+0UWh2lRcKHQmqWbODM118V1TLT/Cp+zVnWmhW6jiz3M
+a4liYn1MBI0pqjQo1udIMXqKEQKBgQDapIbQQzxvwlMbdUqGmL+0Oe0zFsf5WRat
+UYrd2hFt43gvnt5wB1/tqSbmSIOUR627ur4veVJ8vuUwitc26A37qfSzb5hfYjCo
+I4lBpM+g9ag6JyIYGG5zDdMDHOZZgjOqeiOYXQinnGA5422Zj5wnPxspqE5jvZqa
+B5DGq2900QKBgFIgUhOhOVTbkDaX2JVbwPUXivoKgZRcKLp9GMmGQax6eUNASvj/
+vNhnaqd59Uud3lTwH+6KS1FRhKL5boHdurXS2kv0hYjGtSWDulI0LzXXWAaZaPh0
+MaE8wovRsQ5xKiPI9bxj7RWRHJltPal6tNxDjBMbJIgoy0XNxsQRwElhAoGBAL12
+EHRrrvVRON70Vm4n8wbjo03AEe1aa7IolOMF0lCc6kqpqir92PyCtXiboZleO4gP
+nDpbMUVzzfqwdSnZEDTh42+R5kHRPkSU9p1xiZH7DZnGy16B3UPJ2O47nsg1cTvq
+tumSxKspcKD5GMIWlcPUhV8lvzfi1xNeNvBRIjXhAoGBAMJ9SeU57T+drpB5Y8p4
+5PbK3O6cv+yjcvz+ZTlbZfr6TFgZmTDoog10BK5ui5axqpwIPxgCDck39s5q99Yk
+TZjTcFlWfp1LXl3neNMV+TV2VeDL0p5Vht1hushSbeTuLFGyAFrMwETWPcbpWyaU
+hrv0uWuPzfR+bpl6Mg8P+V7F
 -----END PRIVATE KEY-----
 -----BEGIN CERTIFICATE-----
-MIIDIzCCAgugAwIBAgIJANerJEEww4jYMA0GCSqGSIb3DQEBCwUAMCgxEjAQBgNV
-BAoMCW5jYXQtdGVzdDESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTIyMDkyMjAxMzEz
-MFoXDTIyMTAyMjAxMzEzMFowKDESMBAGA1UECgwJbmNhdC10ZXN0MRIwEAYDVQQD
-DAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQChGGUW
-Um7QUE2ZxBNaKuz7eSuR6LkGhhc5kzwRp4BqbUzHkdKr8glFeyP8Vmqszp+pKcdV
-ahFE9WH3/mWk1Vuu8dGf6omhDwdzkqzASnSK8XDYYs8wWZycgewRkzJ2ZWqkN0Mj
-iVnek4XVjcom6ZxQb000V0/rpkzcmHfzatnkSo6cIjiF/Yk886bulMFwbtQ69KPt
-g/7jNgPEN2me8nzSRW6cdBKcFR9tSJ196W5CxZzL7dUDitk+mUwghsCVhAygCUEM
-sAxlzZsvRio6Hx5Jjaoeb3ZrWJSrQP11MNQ6aXYWHYPKFQrJlWqvmUdPNUNZA5UJ
-g3jWZj89/UkTYrmLAgMBAAGjUDBOMB0GA1UdDgQWBBSnNuK9hPnalhF9DrnQ3B23
-1h8slzAfBgNVHSMEGDAWgBSnNuK9hPnalhF9DrnQ3B231h8slzAMBgNVHRMEBTAD
-AQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAQm68Dk8jc3jGkvJSLbXpC6M3FJbCS2wD5
-rmf51uEoeqzoCnlWWLlX5PvZw9cpS93SfqhNOIulP0sg/sXaCZrfQ5WbrezjR+vT
-MrY6ZyaIMCEX2D+9mpkNdrP/s5k2Rkz2ZZa6YComXWAnEY2N1eIHr2BLiP/gL41G
-GGuS+0SopoWSgINoYLzE+X0dMVsrS01u41056BAnFTv5IQjygQVd5673ras82a3N
-41G+2CKxAtbZ3Bdgz4LJ0pzSVWRwLm2mCqn9eabMtJFjg6v5AlOBgbOHdsLgkMkf
-GnjLBSbr9t37MFFJWK7JFNXfH9MYOrsiaEK1/+N0NQXF733a6fbP
+MIIDIzCCAgugAwIBAgIJAIZBAx+5BVc4MA0GCSqGSIb3DQEBCwUAMCgxEjAQBgNV
+BAoMCW5jYXQtdGVzdDESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTI0MTExOTE5MDcw
+OFoXDTI0MTIxOTE5MDcwOFowKDESMBAGA1UECgwJbmNhdC10ZXN0MRIwEAYDVQQD
+DAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9V/Za
+8PvlqNoespf0lFFic8NPNFnijZEAfmC6q0L7lJmpwCkpNOdbkzmMwKy00PGEt4lK
+fbhxOc0sYcSoDEGY/4LWSc7GcrIl943Mf8raEJMHHY9mEw8nXEML5O65hgTTN6CQ
+PzjpWjpt7jo380SR4PwBWGjCot1oA6jvbbFU2HQlSujHVkRwI+6mQhuyP69ex5u9
+jPFKEoXy27iNCeABzm31TkOQiKHdyOqVQvyhjB93CDaK8ihRAQpNJ+RGeXVVXEda
+g/f+RB+RGK1cfUU6bIpRszZiz0QVLQijHjoRT8iuOV5SoE/hnblkwqOzsmdWTsRT
+y04DD2yBL90j+WvhAgMBAAGjUDBOMB0GA1UdDgQWBBT6EKiQbOabVKrCrHto/yGT
+7esBWjAfBgNVHSMEGDAWgBT6EKiQbOabVKrCrHto/yGT7esBWjAMBgNVHRMEBTAD
+AQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAXFUs0++RexaYK4rkVS7W1IChOEJ+U86Z/
+f/CFrR0qep1v7UDpDA00xXfVMwpcPAqqJPyqEFjHXOJ+tMWzXOGgYk93Znux8SsE
+1WnILOUYCo+BGGPbAjmApjgrIYgThSB8vuKOcgVZcuIdXjQB012aTe+K7g3LilYa
+gITkf6UM65bROKwzuAEXJ4n8LT6+9bZNPB7haTYqVjRzNGhwoMyQj87MsJimqQVA
+AdGOC6ZsNANspFt8mdbPNyss0hLlotW9sm+I7Lk0Ha7vDJVOqv3ZKVQ8taZnKePd
+rS/0kKCf8g3bV1pPZAwd9b0C8yyuRkEmjuuzkZiuaRw3L3ctgVhF
 -----END CERTIFICATE-----