diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index 39e3a41a8..fcf8d1916 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -1914,9 +1914,9 @@ data_exchange:
 
     /*
      * 7a. Request renegotiation while client is waiting for input from us.
-     * (only if we're going to exhange more data afterwards)
+     * (only on the first exchange, to be able to test retransmission)
      */
-    if( opt.renegotiate && exchanges > 1 )
+    if( opt.renegotiate && exchanges == opt.exchanges )
     {
         printf( "  . Requestion renegotiation..." );
         fflush( stdout );
diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index 716174e40..bf5d4d099 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -2438,12 +2438,12 @@ run_test    "DTLS proxy: 3d, min handshake, client-initiated renego, nbio" \
 
 needs_more_time 4
 run_test    "DTLS proxy: 3d, min handshake, server-initiated renego" \
-            -p "$P_PXY drop=5 delay=5 duplicate=5 protect_len=41" \
+            -p "$P_PXY drop=5 delay=5 duplicate=5" \
             "$P_SRV dtls=1 hs_timeout=250-10000 tickets=0 auth_mode=none \
-             psk=abc123 renegotiate=1 renegotiation=1 exchanges=2 \
+             psk=abc123 renegotiate=1 renegotiation=1 exchanges=4 \
              debug_level=2" \
             "$P_CLI dtls=1 hs_timeout=250-10000 tickets=0 psk=abc123 \
-             renegotiation=1 exchanges=2 debug_level=2 \
+             renegotiation=1 exchanges=4 debug_level=2 \
              force_ciphersuite=TLS-PSK-WITH-AES-128-CCM-8" \
             0 \
             -c "=> renegotiate" \
@@ -2453,12 +2453,12 @@ run_test    "DTLS proxy: 3d, min handshake, server-initiated renego" \
 
 needs_more_time 4
 run_test    "DTLS proxy: 3d, min handshake, server-initiated renego, nbio" \
-            -p "$P_PXY drop=5 delay=5 duplicate=5 protect_len=41" \
+            -p "$P_PXY drop=5 delay=5 duplicate=5" \
             "$P_SRV dtls=1 hs_timeout=250-10000 tickets=0 auth_mode=none \
-             psk=abc123 renegotiate=1 renegotiation=1 exchanges=2 \
+             psk=abc123 renegotiate=1 renegotiation=1 exchanges=4 \
              debug_level=2 nbio=2" \
             "$P_CLI dtls=1 hs_timeout=250-10000 tickets=0 psk=abc123 \
-             renegotiation=1 exchanges=2 debug_level=2 nbio=2 \
+             renegotiation=1 exchanges=4 debug_level=2 nbio=2 \
              force_ciphersuite=TLS-PSK-WITH-AES-128-CCM-8" \
             0 \
             -c "=> renegotiate" \