diff --git a/tests/expectations/knownfailures.txt b/tests/expectations/knownfailures.txt
index 844e5b9..e0f16f8 100644
--- a/tests/expectations/knownfailures.txt
+++ b/tests/expectations/knownfailures.txt
@@ -4,6 +4,10 @@
   bug: 5513533
 },
 {
+  name: "android.hardware.cts.CameraGLTest#testCameraToSurfaceTextureMetadata",
+  bug: 5544055
+},
+{
   name: "android.hardware.cts.CameraGLTest#testSetPreviewTextureBothCallbacks",
   bug: 5534460
 },
@@ -16,10 +20,6 @@
   bug: 5492725
 },
 {
-  name: "android.media.cts.MediaPlayerTest#testVideoSurfaceResetting",
-  bug: 5382086
-},
-{
   names: [
     "android.media.cts.VisualizerTest#test2_0PollingCapture",
     "android.media.cts.VisualizerTest#test2_1ListenerCapture"
@@ -62,7 +62,11 @@
   bug: 5051682
 },
 {
-  name: "libcore.java.net.URLConnectionTest#testServerClosesSocket",
+  names: [
+    "libcore.java.net.URLConnectionTest#testServerClosesSocket",
+    "libcore.java.net.URLConnectionTest#testServerShutdownInput",
+    "libcore.java.net.URLConnectionTest#testServerShutdownOutput"
+  ],
   bug: 5534202
 },
 {