diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index 6879f3e..e4a1426 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -71,7 +71,7 @@
  * longer paquets (for fragmentation purposes) */
 #define GET_REQUEST "GET %s HTTP/1.0\r\n" /* LONG_HEADER */ "\r\n"
 
-/* Temporary, should become a runtime option later */
+/* Uncomment to test client-initiated renegotiation */
 // #define TEST_RENEGO
 
 /*
diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index 890c119..d35ab77 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -83,7 +83,7 @@
     "<h2>PolarSSL Test Server</h2>\r\n" \
     "<p>Successful connection using: %s</p>\r\n" // LONG_RESPONSE
 
-/* Temporary, should become a runtime option later */
+/* Uncomment to test server-initiated renegotiation */
 // #define TEST_RENEGO
 
 /*
@@ -948,15 +948,20 @@
      */
     printf( "  . Requestion renegotiation..." );
     fflush( stdout );
-    while( ( ret = ssl_write_hello_request( &ssl ) ) != 0 )
+    while( ( ret = ssl_renegotiate( &ssl ) ) != 0 )
     {
         if( ret != POLARSSL_ERR_NET_WANT_READ && ret != POLARSSL_ERR_NET_WANT_WRITE )
         {
-            printf( " failed\n  ! ssl_write_hello_request returned %d\n\n", ret );
+            printf( " failed\n  ! ssl_renegotiate returned %d\n\n", ret );
             goto exit;
         }
     }
 
+    /*
+     * Should be a while loop, not an if, but here we're not actually
+     * expecting data from the client, and since we're running tests locally,
+     * we can just hope the handshake will finish the during the first call.
+     */
     if( ( ret = ssl_read( &ssl, buf, 0 ) ) != 0 )
     {
         if( ret != POLARSSL_ERR_NET_WANT_READ && ret != POLARSSL_ERR_NET_WANT_WRITE )