diff --git a/test/jdk/javax/net/ssl/TLSCommon/TestSessionLocalPrincipal.java b/test/jdk/javax/net/ssl/TLSCommon/TestSessionLocalPrincipal.java
index 77af0a5a59e..092a6e4aee8 100644
--- a/test/jdk/javax/net/ssl/TLSCommon/TestSessionLocalPrincipal.java
+++ b/test/jdk/javax/net/ssl/TLSCommon/TestSessionLocalPrincipal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018,2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@ import javax.net.ssl.TrustManagerFactory;
 
 /*
  * @test
- * @bug 8206355
+ * @bug 8206355 8225438
  * @summary Test principal that was sent to the peer during handshake.
  * @run main/othervm TestSessionLocalPrincipal
  */
@@ -131,7 +131,6 @@ public class TestSessionLocalPrincipal {
             latch.countDown();
             try (SSLSocket sslSocket = (SSLSocket) sslServerSocket.accept()) {
                 sslSocket.setNeedClientAuth(this.clientAuth);
-                sslSocket.setSoTimeout(5000);
                 try (InputStream sslIS = sslSocket.getInputStream();
                         OutputStream sslOS = sslSocket.getOutputStream();) {
                     sslIS.read();