diff --git a/mozilla/nsprpub/pr/tests/cltsrv.c b/mozilla/nsprpub/pr/tests/cltsrv.c
index 266dc552d0a..e25d6695cf9 100644
--- a/mozilla/nsprpub/pr/tests/cltsrv.c
+++ b/mozilla/nsprpub/pr/tests/cltsrv.c
@@ -762,9 +762,15 @@ static void PR_CALLBACK Server(void *arg)
     PRNetAddr serverAddress;
     PRThread *me = PR_CurrentThread();
     CSServer_t *server = (CSServer_t*)arg;
+    PRSocketOptionData sockOpt;
 
     server->listener = PR_Socket(domain, SOCK_STREAM, protocol);
 
+    sockOpt.option = PR_SockOpt_Reuseaddr;
+    sockOpt.value.reuse_addr = PR_TRUE;
+    rv = PR_SetSocketOption(server->listener, &sockOpt);
+    TEST_ASSERT(PR_SUCCESS == rv);
+
     memset(&serverAddress, 0, sizeof(serverAddress));
     rv = PR_InitializeNetAddr(PR_IpAddrAny, DEFAULT_PORT, &serverAddress);