diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index dea598a..d82ad60 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -14463,8 +14463,7 @@
 # into fragments, the tests require certificate authentication. The party in control
 # of the fragmentation operations is OpenSSL and will always use server5.crt (548 Bytes)
 # either from O_NEXT_SRV or test data.
-requires_openssl_3_x
-requires_protocol_version tls13
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
 run_test    "Handshake defragmentation on client (no fragmentation, for reference)" \
             "$O_NEXT_SRV" \
@@ -14473,8 +14472,7 @@
             -C "reassembled record" \
             -C "waiting for more fragments"
 
-requires_openssl_3_x
-requires_protocol_version tls13
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
 run_test    "Handshake defragmentation on client: len=512, TLS 1.3" \
             "$O_NEXT_SRV -tls1_3 -split_send_frag 512 " \
@@ -14484,8 +14482,7 @@
             -c "handshake fragment: 0 \\.\\. 512 of [0-9]\\+ msglen 512" \
             -c "waiting for more fragments (512 of [0-9]\\+"
 
-requires_openssl_3_x
-requires_protocol_version tls12
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
 requires_certificate_authentication
 run_test    "Handshake defragmentation on client: len=512, TLS 1.2" \
             "$O_NEXT_SRV -tls1_2 -split_send_frag 512 " \
@@ -14495,8 +14492,7 @@
             -c "handshake fragment: 0 \\.\\. 512 of [0-9]\\+ msglen 512" \
             -c "waiting for more fragments (512 of [0-9]\\+"
 
-requires_openssl_3_x
-requires_protocol_version tls13
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
 run_test    "Handshake defragmentation on client: len=513, TLS 1.3" \
             "$O_NEXT_SRV -tls1_3 -split_send_frag 513 " \
@@ -14506,8 +14502,7 @@
             -c "handshake fragment: 0 \\.\\. 513 of [0-9]\\+ msglen 513" \
             -c "waiting for more fragments (513 of [0-9]\\+"
 
-requires_openssl_3_x
-requires_protocol_version tls12
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
 requires_certificate_authentication
 run_test    "Handshake defragmentation on client: len=513, TLS 1.2" \
             "$O_NEXT_SRV -tls1_2 -split_send_frag 513 " \
@@ -14517,8 +14512,7 @@
             -c "handshake fragment: 0 \\.\\. 513 of [0-9]\\+ msglen 513" \
             -c "waiting for more fragments (513 of [0-9]\\+"
 
-requires_openssl_3_x
-requires_protocol_version tls13
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
 run_test    "Handshake defragmentation on client: len=256, TLS 1.3" \
             "$O_NEXT_SRV -tls1_3 -split_send_frag 256 " \
@@ -14528,8 +14522,7 @@
             -c "handshake fragment: 0 \\.\\. 256 of [0-9]\\+ msglen 256" \
             -c "waiting for more fragments (256 of [0-9]\\+"
 
-requires_openssl_3_x
-requires_protocol_version tls12
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
 requires_certificate_authentication
 run_test    "Handshake defragmentation on client: len=256, TLS 1.2" \
             "$O_NEXT_SRV -tls1_2 -split_send_frag 256 " \
@@ -14539,8 +14532,7 @@
             -c "handshake fragment: 0 \\.\\. 256 of [0-9]\\+ msglen 256" \
             -c "waiting for more fragments (256 of [0-9]\\+"
 
-requires_openssl_3_x
-requires_protocol_version tls13
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
 run_test    "Handshake defragmentation on client: len=128, TLS 1.3" \
             "$O_NEXT_SRV -tls1_3 -split_send_frag 128 " \
@@ -14550,8 +14542,7 @@
             -c "handshake fragment: 0 \\.\\. 128 of [0-9]\\+ msglen 128" \
             -c "waiting for more fragments (128"
 
-requires_openssl_3_x
-requires_protocol_version tls12
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
 requires_certificate_authentication
 run_test    "Handshake defragmentation on client: len=128, TLS 1.2" \
             "$O_NEXT_SRV -tls1_2 -split_send_frag 128 " \
@@ -14561,8 +14552,7 @@
             -c "handshake fragment: 0 \\.\\. 128 of [0-9]\\+ msglen 128" \
             -c "waiting for more fragments (128"
 
-requires_openssl_3_x
-requires_protocol_version tls13
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
 run_test    "Handshake defragmentation on client: len=64, TLS 1.3" \
             "$O_NEXT_SRV -tls1_3 -split_send_frag 64 " \
@@ -14572,8 +14562,7 @@
             -c "handshake fragment: 0 \\.\\. 64 of [0-9]\\+ msglen 64" \
             -c "waiting for more fragments (64"
 
-requires_openssl_3_x
-requires_protocol_version tls12
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
 requires_certificate_authentication
 run_test    "Handshake defragmentation on client: len=64, TLS 1.2" \
             "$O_NEXT_SRV -tls1_2 -split_send_frag 64 " \
@@ -14583,8 +14572,7 @@
             -c "handshake fragment: 0 \\.\\. 64 of [0-9]\\+ msglen 64" \
             -c "waiting for more fragments (64"
 
-requires_openssl_3_x
-requires_protocol_version tls13
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
 run_test    "Handshake defragmentation on client: len=36, TLS 1.3" \
             "$O_NEXT_SRV -tls1_3 -split_send_frag 36 " \
@@ -14594,8 +14582,7 @@
             -c "handshake fragment: 0 \\.\\. 36 of [0-9]\\+ msglen 36" \
             -c "waiting for more fragments (36"
 
-requires_openssl_3_x
-requires_protocol_version tls12
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
 requires_certificate_authentication
 run_test    "Handshake defragmentation on client: len=36, TLS 1.2" \
             "$O_NEXT_SRV -tls1_2 -split_send_frag 36 " \
@@ -14605,8 +14592,7 @@
             -c "handshake fragment: 0 \\.\\. 36 of [0-9]\\+ msglen 36" \
             -c "waiting for more fragments (36"
 
-requires_openssl_3_x
-requires_protocol_version tls13
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
 run_test    "Handshake defragmentation on client: len=32, TLS 1.3" \
             "$O_NEXT_SRV -tls1_3 -split_send_frag 32 " \
@@ -14616,8 +14602,7 @@
             -c "handshake fragment: 0 \\.\\. 32 of [0-9]\\+ msglen 32" \
             -c "waiting for more fragments (32"
 
-requires_openssl_3_x
-requires_protocol_version tls12
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
 requires_certificate_authentication
 run_test    "Handshake defragmentation on client: len=32, TLS 1.2" \
             "$O_NEXT_SRV -tls1_2 -split_send_frag 32 " \
@@ -14627,8 +14612,7 @@
             -c "handshake fragment: 0 \\.\\. 32 of [0-9]\\+ msglen 32" \
             -c "waiting for more fragments (32"
 
-requires_openssl_3_x
-requires_protocol_version tls13
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
 run_test    "Handshake defragmentation on client: len=16, TLS 1.3" \
             "$O_NEXT_SRV -tls1_3 -split_send_frag 16 " \
@@ -14638,8 +14622,7 @@
             -c "handshake fragment: 0 \\.\\. 16 of [0-9]\\+ msglen 16" \
             -c "waiting for more fragments (16"
 
-requires_openssl_3_x
-requires_protocol_version tls12
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
 requires_certificate_authentication
 run_test    "Handshake defragmentation on client: len=16, TLS 1.2" \
             "$O_NEXT_SRV -tls1_2 -split_send_frag 16 " \
@@ -14649,8 +14632,7 @@
             -c "handshake fragment: 0 \\.\\. 16 of [0-9]\\+ msglen 16" \
             -c "waiting for more fragments (16"
 
-requires_openssl_3_x
-requires_protocol_version tls13
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
 run_test    "Handshake defragmentation on client: len=13, TLS 1.3" \
             "$O_NEXT_SRV -tls1_3 -split_send_frag 13 " \
@@ -14661,8 +14643,7 @@
             -c "waiting for more fragments (13"
 
 skip_next_test
-requires_openssl_3_x
-requires_protocol_version tls12
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
 requires_certificate_authentication
 run_test    "Handshake defragmentation on client: len=13, TLS 1.2" \
             "$O_NEXT_SRV -tls1_2 -split_send_frag 13 " \
@@ -14672,8 +14653,7 @@
             -c "handshake fragment: 0 \\.\\. 13 of [0-9]\\+ msglen 13" \
             -c "waiting for more fragments (13"
 
-requires_openssl_3_x
-requires_protocol_version tls13
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
 run_test    "Handshake defragmentation on client: len=5, TLS 1.3" \
             "$O_NEXT_SRV -tls1_3 -split_send_frag 5 " \
@@ -14684,8 +14664,7 @@
             -c "waiting for more fragments (5"
 
 skip_next_test
-requires_openssl_3_x
-requires_protocol_version tls12
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
 requires_certificate_authentication
 run_test    "Handshake defragmentation on client: len=5, TLS 1.2" \
             "$O_NEXT_SRV -tls1_2 -split_send_frag 5 " \
@@ -14695,8 +14674,7 @@
             -c "handshake fragment: 0 \\.\\. 5 of [0-9]\\+ msglen 5" \
             -c "waiting for more fragments (5"
 
-requires_openssl_3_x
-requires_protocol_version tls13
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
 run_test    "Handshake defragmentation on client: len=4, TLS 1.3" \
             "$O_NEXT_SRV -tls1_3 -split_send_frag 4 " \
@@ -14707,8 +14685,7 @@
             -c "waiting for more fragments (4"
 
 skip_next_test
-requires_openssl_3_x
-requires_protocol_version tls12
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
 requires_certificate_authentication
 run_test    "Handshake defragmentation on client: len=4, TLS 1.2" \
             "$O_NEXT_SRV -tls1_2 -split_send_frag 4 " \
@@ -14718,8 +14695,7 @@
             -c "handshake fragment: 0 \\.\\. 4 of [0-9]\\+ msglen 4" \
             -c "waiting for more fragments (4"
 
-requires_openssl_3_x
-requires_protocol_version tls13
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
 run_test    "Handshake defragmentation on client: len=3, TLS 1.3" \
             "$O_NEXT_SRV -tls1_3 -split_send_frag 3 " \
@@ -14729,8 +14705,7 @@
             -c "handshake message too short: 3" \
             -c "SSL - An invalid SSL record was received"
 
-requires_openssl_3_x
-requires_protocol_version tls12
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
 requires_certificate_authentication
 run_test    "Handshake defragmentation on client: len=3, TLS 1.2" \
             "$O_NEXT_SRV -tls1_2 -split_send_frag 3 " \
@@ -14739,7 +14714,7 @@
             -c "handshake message too short: 3" \
             -c "SSL - An invalid SSL record was received"
 
-requires_protocol_version tls13
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
 run_test    "Handshake defragmentation on server (no fragmentation, for reference)." \
             "$P_SRV debug_level=4 auth_mode=required" \
@@ -14748,8 +14723,7 @@
             -C "reassembled record" \
             -C "waiting for more fragments"
 
-requires_openssl_3_x
-requires_protocol_version tls13
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
 run_test    "Handshake defragmentation on server: len=512, TLS 1.3" \
             "$P_SRV debug_level=4 auth_mode=required" \
@@ -14759,8 +14733,7 @@
             -s "handshake fragment: 0 \\.\\. 512 of [0-9]\\+ msglen 512" \
             -s "waiting for more fragments (512"
 
-requires_openssl_3_x
-requires_protocol_version tls12
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
 requires_certificate_authentication
 run_test    "Handshake defragmentation on server: len=512, TLS 1.2" \
             "$P_SRV debug_level=4 auth_mode=required" \
@@ -14770,8 +14743,7 @@
             -s "handshake fragment: 0 \\.\\. 512 of [0-9]\\+ msglen 512" \
             -s "waiting for more fragments (512"
 
-requires_openssl_3_x
-requires_protocol_version tls13
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
 run_test    "Handshake defragmentation on server: len=513, TLS 1.3" \
             "$P_SRV debug_level=4 auth_mode=required" \
@@ -14781,8 +14753,7 @@
             -s "handshake fragment: 0 \\.\\. 513 of [0-9]\\+ msglen 513" \
             -s "waiting for more fragments (513"
 
-requires_openssl_3_x
-requires_protocol_version tls12
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
 requires_certificate_authentication
 run_test    "Handshake defragmentation on server: len=513, TLS 1.2" \
             "$P_SRV debug_level=4 auth_mode=required" \
@@ -14792,8 +14763,7 @@
             -s "handshake fragment: 0 \\.\\. 513 of [0-9]\\+ msglen 513" \
             -s "waiting for more fragments (513"
 
-requires_openssl_3_x
-requires_protocol_version tls13
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
 run_test    "Handshake defragmentation on server: len=256, TLS 1.3" \
             "$P_SRV debug_level=4 auth_mode=required" \
@@ -14803,8 +14773,7 @@
             -s "handshake fragment: 0 \\.\\. 256 of [0-9]\\+ msglen 256" \
             -s "waiting for more fragments (256"
 
-requires_openssl_3_x
-requires_protocol_version tls12
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
 requires_certificate_authentication
 run_test    "Handshake defragmentation on server: len=256, TLS 1.2" \
             "$P_SRV debug_level=4 auth_mode=required" \
@@ -14814,8 +14783,7 @@
             -s "handshake fragment: 0 \\.\\. 256 of [0-9]\\+ msglen 256" \
             -s "waiting for more fragments (256"
 
-requires_openssl_3_x
-requires_protocol_version tls13
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
 run_test    "Handshake defragmentation on server: len=128, TLS 1.3" \
             "$P_SRV debug_level=4 auth_mode=required" \
@@ -14827,7 +14795,6 @@
 
 # Server-side ClientHello degfragmentation is only supported for MBEDTLS_SSL_PROTO_TLS1_3. For TLS 1.2 testing
 # the server should suport both protocols and downgrade to client-requested TL1.2 after proccessing the ClientHello.
-requires_openssl_3_x
 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
@@ -14839,8 +14806,7 @@
             -s "handshake fragment: 0 \\.\\. 128 of [0-9]\\+ msglen 128" \
             -s "waiting for more fragments (128"
 
-requires_openssl_3_x
-requires_protocol_version tls13
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
 run_test    "Handshake defragmentation on server: len=64, TLS 1.3" \
             "$P_SRV debug_level=4 auth_mode=required" \
@@ -14850,7 +14816,6 @@
             -s "handshake fragment: 0 \\.\\. 64 of [0-9]\\+ msglen 64" \
             -s "waiting for more fragments (64"
 
-requires_openssl_3_x
 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
@@ -14862,8 +14827,7 @@
             -s "handshake fragment: 0 \\.\\. 64 of [0-9]\\+ msglen 64" \
             -s "waiting for more fragments (64"
 
-requires_openssl_3_x
-requires_protocol_version tls13
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
 run_test    "Handshake defragmentation on server: len=36, TLS 1.3" \
             "$P_SRV debug_level=4 auth_mode=required" \
@@ -14873,7 +14837,6 @@
             -s "handshake fragment: 0 \\.\\. 36 of [0-9]\\+ msglen 36" \
             -s "waiting for more fragments (36"
 
-requires_openssl_3_x
 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
@@ -14885,8 +14848,7 @@
             -s "handshake fragment: 0 \\.\\. 36 of [0-9]\\+ msglen 36" \
             -s "waiting for more fragments (36"
 
-requires_openssl_3_x
-requires_protocol_version tls13
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
 run_test    "Handshake defragmentation on server: len=32, TLS 1.3" \
             "$P_SRV debug_level=4 auth_mode=required" \
@@ -14896,7 +14858,6 @@
             -s "handshake fragment: 0 \\.\\. 32 of [0-9]\\+ msglen 32" \
             -s "waiting for more fragments (32"
 
-requires_openssl_3_x
 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
@@ -14908,8 +14869,7 @@
             -s "handshake fragment: 0 \\.\\. 32 of [0-9]\\+ msglen 32" \
             -s "waiting for more fragments (32"
 
-requires_openssl_3_x
-requires_protocol_version tls13
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
 run_test    "Handshake defragmentation on server: len=16, TLS 1.3" \
             "$P_SRV debug_level=4 auth_mode=required" \
@@ -14919,7 +14879,6 @@
             -s "handshake fragment: 0 \\.\\. 16 of [0-9]\\+ msglen 16" \
             -s "waiting for more fragments (16"
 
-requires_openssl_3_x
 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
@@ -14931,8 +14890,7 @@
             -s "handshake fragment: 0 \\.\\. 16 of [0-9]\\+ msglen 16" \
             -s "waiting for more fragments (16"
 
-requires_openssl_3_x
-requires_protocol_version tls13
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
 run_test    "Handshake defragmentation on server: len=13, TLS 1.3" \
             "$P_SRV debug_level=4 auth_mode=required" \
@@ -14942,7 +14900,6 @@
             -s "handshake fragment: 0 \\.\\. 13 of [0-9]\\+ msglen 13" \
             -s "waiting for more fragments (13"
 
-requires_openssl_3_x
 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
@@ -14954,8 +14911,7 @@
             -s "handshake fragment: 0 \\.\\. 13 of [0-9]\\+ msglen 13" \
             -s "waiting for more fragments (13"
 
-requires_openssl_3_x
-requires_protocol_version tls13
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
 run_test    "Handshake defragmentation on server: len=5, TLS 1.3" \
             "$P_SRV debug_level=4 auth_mode=required" \
@@ -14965,7 +14921,6 @@
             -s "handshake fragment: 0 \\.\\. 5 of [0-9]\\+ msglen 5" \
             -s "waiting for more fragments (5"
 
-requires_openssl_3_x
 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
@@ -14977,8 +14932,7 @@
             -s "handshake fragment: 0 \\.\\. 5 of [0-9]\\+ msglen 5" \
             -s "waiting for more fragments (5"
 
-requires_openssl_3_x
-requires_protocol_version tls13
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
 run_test    "Handshake defragmentation on server: len=4, TLS 1.3" \
             "$P_SRV debug_level=4 auth_mode=required" \
@@ -14988,7 +14942,6 @@
             -s "handshake fragment: 0 \\.\\. 4 of [0-9]\\+ msglen 4" \
             -s "waiting for more fragments (4"
 
-requires_openssl_3_x
 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
@@ -15000,8 +14953,7 @@
             -s "handshake fragment: 0 \\.\\. 4 of [0-9]\\+ msglen 4" \
             -s "waiting for more fragments (4"
 
-requires_openssl_3_x
-requires_protocol_version tls13
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
 run_test    "Handshake defragmentation on server: len=3, TLS 1.3" \
             "$P_SRV debug_level=4 auth_mode=required" \
@@ -15011,7 +14963,6 @@
             -s "handshake message too short: 3" \
             -s "SSL - An invalid SSL record was received"
 
-requires_openssl_3_x
 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication
@@ -15023,7 +14974,6 @@
             -s "handshake message too short: 3" \
             -s "SSL - An invalid SSL record was received"
 
-requires_openssl_3_x
 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_certificate_authentication