diff --git a/test/958-methodhandle-emulated-stackframe/build b/test/958-methodhandle-stackframe/build
similarity index 100%
rename from test/958-methodhandle-emulated-stackframe/build
rename to test/958-methodhandle-stackframe/build
diff --git a/test/958-methodhandle-emulated-stackframe/expected.txt b/test/958-methodhandle-stackframe/expected.txt
similarity index 100%
rename from test/958-methodhandle-emulated-stackframe/expected.txt
rename to test/958-methodhandle-stackframe/expected.txt
diff --git a/test/958-methodhandle-emulated-stackframe/info.txt b/test/958-methodhandle-stackframe/info.txt
similarity index 100%
rename from test/958-methodhandle-emulated-stackframe/info.txt
rename to test/958-methodhandle-stackframe/info.txt
diff --git a/test/958-methodhandle-emulated-stackframe/src/Main.java b/test/958-methodhandle-stackframe/src/Main.java
similarity index 100%
rename from test/958-methodhandle-emulated-stackframe/src/Main.java
rename to test/958-methodhandle-stackframe/src/Main.java
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 01eb14e..051ee58 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -374,6 +374,7 @@
 # * 961-default-iface-resolution-gen and 964-default-iface-init-genare very long tests that often
 #   will take more than the timeout to run when gcstress is enabled. This is because gcstress
 #   slows down allocations significantly which these tests do a lot.
+# * 946-obsolete-throw: b/36335999.
 TEST_ART_BROKEN_GCSTRESS_RUN_TESTS := \
   137-cfi \
   152-dead-large-object \
@@ -381,7 +382,8 @@
   908-gc-start-finish \
   913-heaps \
   961-default-iface-resolution-gen \
-  964-default-iface-init-gen
+  964-default-iface-init-gen \
+  946-obsolete-throw
 
 ifneq (,$(filter gcstress,$(GC_TYPES)))
   ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,$(TARGET_TYPES),$(RUN_TYPES),$(PREBUILD_TYPES), \
@@ -440,6 +442,9 @@
   137-cfi \
   138-duplicate-classes-check \
   018-stack-overflow \
+  616-cha \
+  616-cha-abstract \
+  912-classes \
   961-default-iface-resolution-gen \
   964-default-iface-init \
   968-default-partial-compile-gen \
diff --git a/test/knownfailures.json b/test/knownfailures.json
index 535b94f..5923ebd 100644
--- a/test/knownfailures.json
+++ b/test/knownfailures.json
@@ -341,5 +341,17 @@
                   "641-checker-arraycopy"],
         "env_vars": {"ART_USE_READ_BARRIER": "true"},
         "variant": "interpreter | optimizing | regalloc_gc | jit"
+    },
+    {
+        "tests": "946-obsolete-throw",
+        "bug": "http://b/36335999",
+        "variant": "interp-ac & gcstress"
+    },
+    {
+        "tests": ["912-classes",
+                  "616-cha",
+                  "616-cha-abstract"],
+        "bug": "http://b/36344364 http://b36344221",
+        "variant": "no-dex2oat | relocate-npatchoat"
     }
 ]