diff --git a/expectations/skippedCtsTest_manual_base.txt b/expectations/skippedCtsTest_manual_base.txt
index 9bda1f4..45bc39c 100644
--- a/expectations/skippedCtsTest_manual_base.txt
+++ b/expectations/skippedCtsTest_manual_base.txt
@@ -26,5 +26,25 @@
     "bug": 316502724,
     "description": "SharedSecrets class is at different location in newer ART versions",
     "name": "libcore.sun.misc.SharedSecretsTest#testGetJavaIOFileDescriptorAccess_notNull"
+  },
+  {
+    "bug": 338503591,
+    "description": "Test for internal APIs.",
+    "name": "libcore.java.util.LinkedHashMapTest#test_entryCompatibility_runtime"
+  },
+  {
+    "bug": 338503591,
+    "description": "Test for internal APIs.",
+    "name": "libcore.java.util.zip.ZipFileTest#testZipFileOffsetNeverChangesAfterInit"
+  },
+  {
+    "bug": 338503591,
+    "description": "The test asserts buggy or non-breaking behaviors, but the behavior has been fixed in a new mainline module version.",
+    "name": "org.apache.harmony.tests.java.util.zip.DeflaterTest#test_finalize"
+  },
+  {
+    "bug": 338503591,
+    "description": "Test for internal APIs.",
+    "name": "libcore.jdk.internal.misc.SharedSecretsTest#testGetJavaIOFileDescriptorAccess_notNull"
   }
 ]
diff --git a/luni/src/test/java/libcore/java/lang/OldClassTest.java b/luni/src/test/java/libcore/java/lang/OldClassTest.java
index daf3255..3a28398 100644
--- a/luni/src/test/java/libcore/java/lang/OldClassTest.java
+++ b/luni/src/test/java/libcore/java/lang/OldClassTest.java
@@ -16,6 +16,9 @@
 
 package libcore.java.lang;
 
+import libcore.test.annotation.NonCts;
+import libcore.test.reasons.NonCtsReasons;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -424,6 +427,7 @@
     public enum TestEmptyEnum {
     }
 
+    @NonCts(bug = 338503591, reason = NonCtsReasons.NON_BREAKING_BEHAVIOR_FIX)
     public void test_getGenericInterfaces() {
         Type [] types = ExtendTestClass1.class.getGenericInterfaces();
         assertEquals(0, types.length);
diff --git a/luni/src/test/java/libcore/java/lang/reflect/OldAndroidClassTest.java b/luni/src/test/java/libcore/java/lang/reflect/OldAndroidClassTest.java
index 7ec843d..23d1b26 100644
--- a/luni/src/test/java/libcore/java/lang/reflect/OldAndroidClassTest.java
+++ b/luni/src/test/java/libcore/java/lang/reflect/OldAndroidClassTest.java
@@ -16,6 +16,9 @@
 
 package libcore.java.lang.reflect;
 
+import libcore.test.annotation.NonCts;
+import libcore.test.reasons.NonCtsReasons;
+
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -137,6 +140,7 @@
 
     // Regression for 1018067: Class.getMethods() returns the same method over
     // and over again from all base classes
+    @NonCts(bug = 338503591, reason = NonCtsReasons.NON_BREAKING_BEHAVIOR_FIX)
     public void testClassGetMethodsNoDupes() {
         Method[] methods = ArrayList.class.getMethods();
         Set<String> set = new HashSet<String>();
diff --git a/luni/src/test/java/libcore/java/util/zip/ZipFileTest.java b/luni/src/test/java/libcore/java/util/zip/ZipFileTest.java
index b9e942e..1511471 100644
--- a/luni/src/test/java/libcore/java/util/zip/ZipFileTest.java
+++ b/luni/src/test/java/libcore/java/util/zip/ZipFileTest.java
@@ -18,6 +18,8 @@
 
 import android.system.OsConstants;
 import libcore.io.Libcore;
+import libcore.test.annotation.NonCts;
+import libcore.test.reasons.NonCtsReasons;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -41,6 +43,7 @@
     }
 
     // b/31077136
+    @NonCts(bug = 338503591, reason = NonCtsReasons.NON_BREAKING_BEHAVIOR_FIX)
     public void test_FileNotFound() throws Exception {
         File nonExistentFile = new File("fileThatDefinitelyDoesntExist.zip");
         assertFalse(nonExistentFile.exists());