diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index c05600024..15481e183 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -5743,6 +5743,14 @@ run_test    "DTLS proxy: delay ChangeCipherSpec" \
 
 # Tests for reordering support with DTLS
 
+run_test    "DTLS reordering: Buffer out-of-order handshake message" \
+            -p "$P_PXY delay=2 seed=1" \
+            "$P_SRV cookies=0 dtls=1 debug_level=2" \
+            "$P_CLI dtls=1 debug_level=2" \
+            0 \
+            -c "Buffering HS message" \
+            -c "Next handshake message has been buffered - load"
+
 run_test    "DTLS reordering: Buffer out-of-order CCS message"\
             -p "$P_PXY delay=3 seed=1" \
             "$P_SRV cookies=0 dtls=1 debug_level=2" \