diff --git a/openjdk/src/test/java/org/conscrypt/OpenSSLServerSocketImplTest.java b/openjdk/src/test/java/org/conscrypt/OpenSSLServerSocketImplTest.java
index c581247..841c5fc 100644
--- a/openjdk/src/test/java/org/conscrypt/OpenSSLServerSocketImplTest.java
+++ b/openjdk/src/test/java/org/conscrypt/OpenSSLServerSocketImplTest.java
@@ -76,7 +76,11 @@
 
     @Parameters(name = "{0}")
     public static Iterable<SocketType> data() {
-        return Arrays.asList(SocketType.DEFAULT, SocketType.ENGINE);
+        // Android-changed: Temporarily (2017 Q2) disable ENGINE tests. http://b/37271061#comment9
+        // This experimental (unused by default) implementation is unstable and causing test
+        // failures on Android.
+        // return Arrays.asList(SocketType.DEFAULT, SocketType.ENGINE);
+        return Arrays.asList(SocketType.DEFAULT);
     }
 
     @Parameter public SocketType socketType;