3 files changed, 13 insertions, 5 deletions
diff --git a/luni/src/test/java/javax/net/ssl/SSLSessionContextTest.java b/luni/src/test/java/javax/net/ssl/SSLSessionContextTest.java
index 4b4ab6a..83ed9c9 100644
--- a/luni/src/test/java/javax/net/ssl/SSLSessionContextTest.java
+++ b/luni/src/test/java/javax/net/ssl/SSLSessionContextTest.java
@@ -44,7 +44,7 @@ public class SSLSessionContextTest extends TestCase {
         byte[] serverId = (byte[]) serverIds.nextElement();
         assertEquals(32, clientId.length);
         assertEquals(32, serverId.length);
-        assertEquals(clientId, serverId);
+        assertTrue(Arrays.equals(clientId, serverId));
     }
 
     @KnownFailure("Should throw NullPointerException on getSession(null)")
@@ -65,8 +65,8 @@ public class SSLSessionContextTest extends TestCase {
         byte[] serverId = (byte[]) server.getIds().nextElement();
         assertNotNull(client.getSession(clientId));
         assertNotNull(server.getSession(serverId));
-        assertEquals(clientId, client.getSession(clientId).getId());
-        assertEquals(serverId, server.getSession(serverId).getId());
+        assertTrue(Arrays.equals(clientId, client.getSession(clientId).getId()));
+        assertTrue(Arrays.equals(serverId, server.getSession(serverId).getId()));
     }
 
     @KnownFailure("Should return 0 for unlimited, not 10 entries")
diff --git a/luni/src/test/java/javax/net/ssl/SSLSessionTest.java b/luni/src/test/java/javax/net/ssl/SSLSessionTest.java
index 52ae279..020cd41 100644
--- a/luni/src/test/java/javax/net/ssl/SSLSessionTest.java
+++ b/luni/src/test/java/javax/net/ssl/SSLSessionTest.java
@@ -112,7 +112,7 @@ public class SSLSessionTest extends TestCase {
         assertEquals(0, s.invalid.getId().length);
         assertEquals(32, s.server.getId().length);
         assertEquals(32, s.client.getId().length);
-        assertEquals(s.server.getId(), s.client.getId());
+        assertTrue(Arrays.equals(s.server.getId(), s.client.getId()));
     }
 
     public void test_SSLSession_getLastAccessedTime() {
diff --git a/luni/src/test/java/javax/net/ssl/SSLSocketTest.java b/luni/src/test/java/javax/net/ssl/SSLSocketTest.java
index 0e39d47..d02aeee 100644
--- a/luni/src/test/java/javax/net/ssl/SSLSocketTest.java
+++ b/luni/src/test/java/javax/net/ssl/SSLSocketTest.java
@@ -353,6 +353,10 @@ public class SSLSocketTest extends TestCase {
                     assertNotNull(socket);
                     assertSame(client, socket);
 
+                    synchronized (handshakeCompletedListenerCalled) {
+                        handshakeCompletedListenerCalled[0] = true;
+                        handshakeCompletedListenerCalled.notify();
+                    }
                     handshakeCompletedListenerCalled[0] = true;
                 } catch (RuntimeException e) {
                     throw e;
@@ -362,8 +366,12 @@ public class SSLSocketTest extends TestCase {
             }
         });
         client.startHandshake();
-        assertTrue(handshakeCompletedListenerCalled[0]);
         thread.join();
+        synchronized (handshakeCompletedListenerCalled) {
+            while (!handshakeCompletedListenerCalled[0]) {
+                handshakeCompletedListenerCalled.wait();
+            }
+        }
     }
 
     /**