diff --git a/tests/test-dtls.conf b/tests/test-dtls.conf
index a8b22743e..95739f0ed 100644
--- a/tests/test-dtls.conf
+++ b/tests/test-dtls.conf
@@ -118,126 +118,6 @@
 -v 3
 -l AES256-SHA256
 
-# server DTLSv1 DES-CBC3-SHA NON-BLOCKING
--u
--v 2
--l DES-CBC3-SHA
--N
-
-# client DTLSv1 DES-CBC3-SHA NON-BLOCKING
--u
--v 2
--l DES-CBC3-SHA
--N
-
-# server DTLSv1.2 DES-CBC3-SHA NON-BLOCKING
--u
--v 3
--l DES-CBC3-SHA
--N
-
-# client DTLSv1.2 DES-CBC3-SHA NON-BLOCKING
--u
--v 3
--l DES-CBC3-SHA
--N
-
-# server DTLSv1 AES128-SHA NON-BLOCKING
--u
--v 2
--l AES128-SHA
--N
-
-# client DTLSv1 AES128-SHA NON-BLOCKING
--u
--v 2
--l AES128-SHA
--N
-
-# server DTLSv1.2 AES128-SHA NON-BLOCKING
--u
--v 3
--l AES128-SHA
--N
-
-# client DTLSv1.2 AES128-SHA NON-BLOCKING
--u
--v 3
--l AES128-SHA
--N
-
-# server DTLSv1 AES256-SHA NON-BLOCKING
--u
--v 2
--l AES256-SHA
--N
-
-# client DTLSv1 AES256-SHA NON-BLOCKING
--u
--v 2
--l AES256-SHA
--N
-
-# server DTLSv1.2 AES256-SHA NON-BLOCKING
--u
--v 3
--l AES256-SHA
--N
-
-# client DTLSv1.2 AES256-SHA NON-BLOCKING
--u
--v 3
--l AES256-SHA
--N
-
-# server DTLSv1 AES128-SHA256 NON-BLOCKING
--u
--v 2
--l AES128-SHA256
--N
-
-# client DTLSv1 AES128-SHA256 NON-BLOCKING
--u
--v 2
--l AES128-SHA256
--N
-
-# server DTLSv1.2 AES128-SHA256 NON-BLOCKING
--u
--v 3
--l AES128-SHA256
--N
-
-# client DTLSv1.2 AES128-SHA256 NON-BLOCKING
--u
--v 3
--l AES128-SHA256
--N
-
-# server DTLSv1 AES256-SHA256 NON-BLOCKING
--u
--v 2
--l AES256-SHA256
--N
-
-# client DTLSv1 AES256-SHA256 NON-BLOCKING
--u
--v 2
--l AES256-SHA256
--N
-
-# server DTLSv1.2 AES256-SHA256 NON-BLOCKING
--u
--v 3
--l AES256-SHA256
--N
-
-# client DTLSv1.2 AES256-SHA256 NON-BLOCKING
--u
--v 3
--l AES256-SHA256
--N
-
 # server DTLSv1 ECDHE-RSA-RC4
 -u
 -v 2
@@ -900,33 +780,3 @@
 -l ECDHE-ECDSA-AES256-CCM-8-SHA384
 -A ./certs/server-ecc.pem
 
-# server DTLSv1.2 ECDHE-ECDSA-AES128-CCM-8-SHA256 NON-BLOCKING
--u
--v 3
--l ECDHE-ECDSA-AES128-CCM-8-SHA256
--c ./certs/server-ecc.pem
--k ./certs/ecc-key.pem
--N
-
-# client DTLSv1.2 ECDHE-ECDSA-AES128-CCM-8-SHA256 NON-BLOCKING
--u
--v 3
--l ECDHE-ECDSA-AES128-CCM-8-SHA256
--A ./certs/server-ecc.pem
--N
-
-# server DTLSv1.2 ECDHE-ECDSA-AES256-CCM-8-SHA384 NON-BLOCKING
--u
--v 3
--l ECDHE-ECDSA-AES256-CCM-8-SHA384
--c ./certs/server-ecc.pem
--k ./certs/ecc-key.pem
--N
-
-# client DTLSv1.2 ECDHE-ECDSA-AES256-CCM-8-SHA384 NON-BLOCKING
--u
--v 3
--l ECDHE-ECDSA-AES256-CCM-8-SHA384
--A ./certs/server-ecc.pem
--N
-
diff --git a/tests/test.conf b/tests/test.conf
index 63ace18e8..c95f0a959 100644
--- a/tests/test.conf
+++ b/tests/test.conf
@@ -190,246 +190,6 @@
 -v 3
 -l AES256-SHA256
 
-# server SSLv3 RC4-SHA NON-BLOCKING
--v 0
--l RC4-SHA
--N
-
-# client SSLv3 RC4-SHA NON-BLOCKING
--v 0
--l RC4-SHA
--N
-
-# server SSLv3 RC4-MD5 NON-BLOCKING
--v 0
--l RC4-MD5
--N
-
-# client SSLv3 RC4-MD5 NON-BLOCKING
--v 0
--l RC4-MD5
--N
-
-# server SSLv3 DES-CBC3-SHA NON-BLOCKING
--v 0
--l DES-CBC3-SHA
--N
-
-# client SSLv3 DES-CBC3-SHA NON-BLOCKING
--v 0
--l DES-CBC3-SHA
--N
-
-# server TLSv1 RC4-SHA NON-BLOCKING
--v 1
--l RC4-SHA
--N
-
-# client TLSv1 RC4-SHA NON-BLOCKING
--v 1
--l RC4-SHA
--N
-
-# server TLSv1 RC4-MD5 NON-BLOCKING
--v 1
--l RC4-MD5
--N
-
-# client TLSv1 RC4-MD5 NON-BLOCKING
--v 1
--l RC4-MD5
--N
-
-# server TLSv1 DES-CBC3-SHA NON-BLOCKING
--v 1
--l DES-CBC3-SHA
--N
-
-# client TLSv1 DES-CBC3-SHA NON-BLOCKING
--v 1
--l DES-CBC3-SHA
--N
-
-# server TLSv1 AES128-SHA NON-BLOCKING
--v 1
--l AES128-SHA
--N
-
-# client TLSv1 AES128-SHA NON-BLOCKING
--v 1
--l AES128-SHA
--N
-
-# server TLSv1 AES256-SHA NON-BLOCKING
--v 1
--l AES256-SHA
--N
-
-# client TLSv1 AES256-SHA NON-BLOCKING
--v 1
--l AES256-SHA
--N
-
-# server TLSv1 AES128-SHA256 NON-BLOCKING
--v 1
--l AES128-SHA256
--N
-
-# client TLSv1 AES128-SHA256 NON-BLOCKING
--v 1
--l AES128-SHA256
--N
-
-# server TLSv1 AES256-SHA256 NON-BLOCKING
--v 1
--l AES256-SHA256
--N
-
-# client TLSv1 AES256-SHA256 NON-BLOCKING
--v 1
--l AES256-SHA256
--N
-
-# server TLSv1.1 RC4-SHA NON-BLOCKING
--v 2
--l RC4-SHA
--N
-
-# client TLSv1.1 RC4-SHA NON-BLOCKING
--v 2
--l RC4-SHA
--N
-
-# server TLSv1.1 RC4-MD5 NON-BLOCKING
--v 2
--l RC4-MD5
--N
-
-# client TLSv1.1 RC4-MD5 NON-BLOCKING
--v 2
--l RC4-MD5
--N
-
-# server TLSv1.1 DES-CBC3-SHA NON-BLOCKING
--v 2
--l DES-CBC3-SHA
--N
-
-# client TLSv1.1 DES-CBC3-SHA NON-BLOCKING
--v 2
--l DES-CBC3-SHA
--N
-
-# server TLSv1.1 AES128-SHA NON-BLOCKING
--v 2
--l AES128-SHA
--N
-
-# client TLSv1.1 AES128-SHA NON-BLOCKING
--v 2
--l AES128-SHA
--N
-
-# server TLSv1.1 AES256-SHA NON-BLOCKING
--v 2
--l AES256-SHA
--N
-
-# client TLSv1.1 AES256-SHA NON-BLOCKING
--v 2
--l AES256-SHA
--N
-
-# server TLSv1.1 AES128-SHA256 NON-BLOCKING
--v 2
--l AES128-SHA256
--N
-
-# client TLSv1.1 AES128-SHA256 NON-BLOCKING
--v 2
--l AES128-SHA256
--N
-
-# server TLSv1.1 AES256-SHA256 NON-BLOCKING
--v 2
--l AES256-SHA256
--N
-
-# client TLSv1.1 AES256-SHA256 NON-BLOCKING
--v 2
--l AES256-SHA256
--N
-
-# server TLSv1.2 RC4-SHA NON-BLOCKING
--v 3
--l RC4-SHA
--N
-
-# client TLSv1.2 RC4-SHA NON-BLOCKING
--v 3
--l RC4-SHA
--N
-
-# server TLSv1.2 RC4-MD5 NON-BLOCKING
--v 3
--l RC4-MD5
--N
-
-# client TLSv1.2 RC4-MD5 NON-BLOCKING
--v 3
--l RC4-MD5
--N
-
-# server TLSv1.2 DES-CBC3-SHA NON-BLOCKING
--v 3
--l DES-CBC3-SHA
--N
-
-# client TLSv1.2 DES-CBC3-SHA NON-BLOCKING
--v 3
--l DES-CBC3-SHA
--N
-
-# server TLSv1.2 AES128-SHA NON-BLOCKING
--v 3
--l AES128-SHA
--N
-
-# client TLSv1.2 AES128-SHA NON-BLOCKING
--v 3
--l AES128-SHA
--N
-
-# server TLSv1.2 AES256-SHA NON-BLOCKING
--v 3
--l AES256-SHA
--N
-
-# client TLSv1.2 AES256-SHA NON-BLOCKING
--v 3
--l AES256-SHA
--N
-
-# server TLSv1.2 AES128-SHA256 NON-BLOCKING
--v 3
--l AES128-SHA256
--N
-
-# client TLSv1.2 AES128-SHA256 NON-BLOCKING
--v 3
--l AES128-SHA256
--N
-
-# server TLSv1.2 AES256-SHA256 NON-BLOCKING
--v 3
--l AES256-SHA256
--N
-
-# client TLSv1.2 AES256-SHA256 NON-BLOCKING
--v 3
--l AES256-SHA256
--N
-
 # server TLSv1 ECDHE-RSA-RC4
 -v 1
 -l ECDHE-RSA-RC4-SHA
@@ -1564,126 +1324,6 @@
 -v 3
 -l CAMELLIA256-SHA256
 
-# server TLSv1 CAMELLIA128-SHA NON-BLOCKING
--v 1
--l CAMELLIA128-SHA
--N
-
-# client TLSv1 CAMELLIA128-SHA NON-BLOCKING
--v 1
--l CAMELLIA128-SHA
--N
-
-# server TLSv1 CAMELLIA256-SHA NON-BLOCKING
--v 1
--l CAMELLIA256-SHA
--N
-
-# client TLSv1 CAMELLIA256-SHA NON-BLOCKING
--v 1
--l CAMELLIA256-SHA
--N
-
-# server TLSv1 CAMELLIA128-SHA256 NON-BLOCKING
--v 1
--l CAMELLIA128-SHA256
--N
-
-# client TLSv1 CAMELLIA128-SHA256 NON-BLOCKING
--v 1
--l CAMELLIA128-SHA256
--N
-
-# server TLSv1 CAMELLIA256-SHA256 NON-BLOCKING
--v 1
--l CAMELLIA256-SHA256
--N
-
-# client TLSv1 CAMELLIA256-SHA256 NON-BLOCKING
--v 1
--l CAMELLIA256-SHA256
--N
-
-# server TLSv1.1 CAMELLIA128-SHA NON-BLOCKING
--v 2
--l CAMELLIA128-SHA
--N
-
-# client TLSv1.1 CAMELLIA128-SHA NON-BLOCKING
--v 2
--l CAMELLIA128-SHA
--N
-
-# server TLSv1.1 CAMELLIA256-SHA NON-BLOCKING
--v 2
--l CAMELLIA256-SHA
--N
-
-# client TLSv1.1 CAMELLIA256-SHA NON-BLOCKING
--v 2
--l CAMELLIA256-SHA
--N
-
-# server TLSv1.1 CAMELLIA128-SHA256 NON-BLOCKING
--v 2
--l CAMELLIA128-SHA256
--N
-
-# client TLSv1.1 CAMELLIA128-SHA256 NON-BLOCKING
--v 2
--l CAMELLIA128-SHA256
--N
-
-# server TLSv1.1 CAMELLIA256-SHA256 NON-BLOCKING
--v 2
--l CAMELLIA256-SHA256
--N
-
-# client TLSv1.1 CAMELLIA256-SHA256 NON-BLOCKING
--v 2
--l CAMELLIA256-SHA256
--N
-
-# server TLSv1.2 CAMELLIA128-SHA NON-BLOCKING
--v 3
--l CAMELLIA128-SHA
--N
-
-# client TLSv1.2 CAMELLIA128-SHA NON-BLOCKING
--v 3
--l CAMELLIA128-SHA
--N
-
-# server TLSv1.2 CAMELLIA256-SHA NON-BLOCKING
--v 3
--l CAMELLIA256-SHA
--N
-
-# client TLSv1.2 CAMELLIA256-SHA NON-BLOCKING
--v 3
--l CAMELLIA256-SHA
--N
-
-# server TLSv1.2 CAMELLIA128-SHA256 NON-BLOCKING
--v 3
--l CAMELLIA128-SHA256
--N
-
-# client TLSv1.2 CAMELLIA128-SHA256 NON-BLOCKING
--v 3
--l CAMELLIA128-SHA256
--N
-
-# server TLSv1.2 CAMELLIA256-SHA256 NON-BLOCKING
--v 3
--l CAMELLIA256-SHA256
--N
-
-# client TLSv1.2 CAMELLIA256-SHA256 NON-BLOCKING
--v 3
--l CAMELLIA256-SHA256
--N
-
 # server TLSv1 DHE-RSA-CAMELLIA128-SHA
 -v 1
 -l DHE-RSA-CAMELLIA128-SHA
@@ -1780,126 +1420,6 @@
 -v 3
 -l DHE-RSA-CAMELLIA256-SHA256
 
-# server TLSv1 DHE-RSA-CAMELLIA128-SHA NON-BLOCKING
--v 1
--l DHE-RSA-CAMELLIA128-SHA
--N
-
-# client TLSv1 DHE-RSA-CAMELLIA128-SHA NON-BLOCKING
--v 1
--l DHE-RSA-CAMELLIA128-SHA
--N
-
-# server TLSv1 DHE-RSA-CAMELLIA256-SHA NON-BLOCKING
--v 1
--l DHE-RSA-CAMELLIA256-SHA
--N
-
-# client TLSv1 DHE-RSA-CAMELLIA256-SHA NON-BLOCKING
--v 1
--l DHE-RSA-CAMELLIA256-SHA
--N
-
-# server TLSv1 DHE-RSA-CAMELLIA128-SHA256 NON-BLOCKING
--v 1
--l DHE-RSA-CAMELLIA128-SHA256
--N
-
-# client TLSv1 DHE-RSA-CAMELLIA128-SHA256 NON-BLOCKING
--v 1
--l DHE-RSA-CAMELLIA128-SHA256
--N
-
-# server TLSv1 DHE-RSA-CAMELLIA256-SHA256 NON-BLOCKING
--v 1
--l DHE-RSA-CAMELLIA256-SHA256
--N
-
-# client TLSv1 DHE-RSA-CAMELLIA256-SHA256 NON-BLOCKING
--v 1
--l DHE-RSA-CAMELLIA256-SHA256
--N
-
-# server TLSv1.1 DHE-RSA-CAMELLIA128-SHA NON-BLOCKING
--v 2
--l DHE-RSA-CAMELLIA128-SHA
--N
-
-# client TLSv1.1 DHE-RSA-CAMELLIA128-SHA NON-BLOCKING
--v 2
--l DHE-RSA-CAMELLIA128-SHA
--N
-
-# server TLSv1.1 DHE-RSA-CAMELLIA256-SHA NON-BLOCKING
--v 2
--l DHE-RSA-CAMELLIA256-SHA
--N
-
-# client TLSv1.1 DHE-RSA-CAMELLIA256-SHA NON-BLOCKING
--v 2
--l DHE-RSA-CAMELLIA256-SHA
--N
-
-# server TLSv1.1 DHE-RSA-CAMELLIA128-SHA256 NON-BLOCKING
--v 2
--l DHE-RSA-CAMELLIA128-SHA256
--N
-
-# client TLSv1.1 DHE-RSA-CAMELLIA128-SHA256 NON-BLOCKING
--v 2
--l DHE-RSA-CAMELLIA128-SHA256
--N
-
-# server TLSv1.1 DHE-RSA-CAMELLIA256-SHA256 NON-BLOCKING
--v 2
--l DHE-RSA-CAMELLIA256-SHA256
--N
-
-# client TLSv1.1 DHE-RSA-CAMELLIA256-SHA256 NON-BLOCKING
--v 2
--l DHE-RSA-CAMELLIA256-SHA256
--N
-
-# server TLSv1.2 DHE-RSA-CAMELLIA128-SHA NON-BLOCKING
--v 3
--l DHE-RSA-CAMELLIA128-SHA
--N
-
-# client TLSv1.2 DHE-RSA-CAMELLIA128-SHA NON-BLOCKING
--v 3
--l DHE-RSA-CAMELLIA128-SHA
--N
-
-# server TLSv1.2 DHE-RSA-CAMELLIA256-SHA NON-BLOCKING
--v 3
--l DHE-RSA-CAMELLIA256-SHA
--N
-
-# client TLSv1.2 DHE-RSA-CAMELLIA256-SHA NON-BLOCKING
--v 3
--l DHE-RSA-CAMELLIA256-SHA
--N
-
-# server TLSv1.2 DHE-RSA-CAMELLIA128-SHA256 NON-BLOCKING
--v 3
--l DHE-RSA-CAMELLIA128-SHA256
--N
-
-# client TLSv1.2 DHE-RSA-CAMELLIA128-SHA256 NON-BLOCKING
--v 3
--l DHE-RSA-CAMELLIA128-SHA256
--N
-
-# server TLSv1.2 DHE-RSA-CAMELLIA256-SHA256 NON-BLOCKING
--v 3
--l DHE-RSA-CAMELLIA256-SHA256
--N
-
-# client TLSv1.2 DHE-RSA-CAMELLIA256-SHA256 NON-BLOCKING
--v 3
--l DHE-RSA-CAMELLIA256-SHA256
--N
-
 # server TLSv1.2 RSA-AES128-GCM-SHA256 
 -v 3
 -l AES128-GCM-SHA256
@@ -2028,26 +1548,6 @@
 -v 3
 -l AES256-CCM-8-SHA384
 
-# server TLSv1.2 AES128-CCM-8-SHA256 NON-BLOCKING
--v 3
--l AES128-CCM-8-SHA256
--N
-
-# client TLSv1.2 AES128-CCM-8-SHA256 NON-BLOCKING
--v 3
--l AES128-CCM-8-SHA256
--N
-
-# server TLSv1.2 AES256-CCM-8-SHA384 NON-BLOCKING
--v 3
--l AES256-CCM-8-SHA384
--N
-
-# client TLSv1.2 AES256-CCM-8-SHA384 NON-BLOCKING
--v 3
--l AES256-CCM-8-SHA384
--N
-
 # server TLSv1.2 ECDHE-ECDSA-AES128-CCM-8-SHA256
 -v 3
 -l ECDHE-ECDSA-AES128-CCM-8-SHA256
@@ -2070,29 +1570,3 @@
 -l ECDHE-ECDSA-AES256-CCM-8-SHA384
 -A ./certs/server-ecc.pem
 
-# server TLSv1.2 ECDHE-ECDSA-AES128-CCM-8-SHA256 NON-BLOCKING
--v 3
--l ECDHE-ECDSA-AES128-CCM-8-SHA256
--c ./certs/server-ecc.pem
--k ./certs/ecc-key.pem
--N
-
-# client TLSv1.2 ECDHE-ECDSA-AES128-CCM-8-SHA256 NON-BLOCKING
--v 3
--l ECDHE-ECDSA-AES128-CCM-8-SHA256
--A ./certs/server-ecc.pem
--N
-
-# server TLSv1.2 ECDHE-ECDSA-AES256-CCM-8-SHA384 NON-BLOCKING
--v 3
--l ECDHE-ECDSA-AES256-CCM-8-SHA384
--c ./certs/server-ecc.pem
--k ./certs/ecc-key.pem
--N
-
-# client TLSv1.2 ECDHE-ECDSA-AES256-CCM-8-SHA384 NON-BLOCKING
--v 3
--l ECDHE-ECDSA-AES256-CCM-8-SHA384
--A ./certs/server-ecc.pem
--N
-