diff --git a/compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.java b/compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.java
index 38853051fbd..c261c642065 100644
--- a/compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.java
+++ b/compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.java
@@ -1,3 +1,5 @@
+// FULL_JDK
+
 package test;
 
 public abstract class ClassDoesNotOverrideMethod extends java.util.Date {
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.java b/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.java
index f95b69b54c5..683540f1b32 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.java
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.java
@@ -1,3 +1,5 @@
+// FULL_JDK
+
 package test;
 
 public abstract class ClassWithTypePExtendsIterableP<P> implements java.lang.Iterable<P> {
diff --git a/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.runtime.txt b/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.runtime.txt
deleted file mode 100644
index 258511ee456..00000000000
--- a/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.runtime.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-package test
-
-public open class InnerClassesInGeneric</*0*/ P : kotlin.Any!, /*1*/ Q : kotlin.Any!> {
-    public constructor InnerClassesInGeneric</*0*/ P : kotlin.Any!, /*1*/ Q : kotlin.Any!>()
-
-    public open inner class Inner /*captured type parameters: /*0*/ P : kotlin.Any!, /*1*/ Q : kotlin.Any!*/ {
-        public constructor Inner()
-    }
-
-    public open inner class Inner2 /*captured type parameters: /*0*/ P : kotlin.Any!, /*1*/ Q : kotlin.Any!*/ : test.InnerClassesInGeneric<kotlin.Any!, kotlin.Any!>.Inner {
-        public constructor Inner2()
-        public open operator fun iterator(): kotlin.collections.(Mutable)Iterator<P!>!
-    }
-}
diff --git a/compiler/testData/loadJava/compiledJava/InnerOfGeneric.runtime.txt b/compiler/testData/loadJava/compiledJava/InnerOfGeneric.runtime.txt
deleted file mode 100644
index b85e01b5102..00000000000
--- a/compiler/testData/loadJava/compiledJava/InnerOfGeneric.runtime.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-package test
-
-public open class InnerOfGeneric {
-    public constructor InnerOfGeneric()
-
-    public abstract inner class A</*0*/ K : kotlin.Any!> {
-        public constructor A</*0*/ K : kotlin.Any!>()
-
-        public abstract inner class Inner /*captured type parameters: /*0*/ K : kotlin.Any!*/ : test.InnerOfGeneric.S<K!> {
-            public constructor Inner()
-            public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.(Mutable)Iterator<K!>!
-        }
-    }
-
-    public open inner class B</*0*/ L : kotlin.Any!> : test.InnerOfGeneric.A<L!> {
-        public constructor B</*0*/ L : kotlin.Any!>()
-
-        public open inner class SubInner /*captured type parameters: /*0*/ L : kotlin.Any!*/ : test.InnerOfGeneric.A<kotlin.Any!>.Inner {
-            public constructor SubInner()
-            public open override /*1*/ fun iterator(): kotlin.collections.(Mutable)Iterator<L!>!
-        }
-    }
-
-    public open inner class S</*0*/ E : kotlin.Any!> {
-        public constructor S</*0*/ E : kotlin.Any!>()
-        public open operator fun iterator(): kotlin.collections.(Mutable)Iterator<E!>!
-    }
-}
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.runtime.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.runtime.txt
deleted file mode 100644
index 7e7ffd78297..00000000000
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.runtime.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-package test
-
-public interface ReturnInnerSubclassOfSupersInner {
-
-    public open class Sub</*0*/ B : kotlin.Any!> : test.ReturnInnerSubclassOfSupersInner.Super<B!> {
-        public constructor Sub</*0*/ B : kotlin.Any!>()
-
-        public/*package*/ open inner class Inner /*captured type parameters: /*0*/ B : kotlin.Any!*/ : test.ReturnInnerSubclassOfSupersInner.Super<kotlin.Any!>.Inner {
-            public/*package*/ constructor Inner()
-            public/*package*/ open override /*1*/ fun get(): test.ReturnInnerSubclassOfSupersInner.Sub<B!>!
-        }
-    }
-
-    public open class Super</*0*/ A : kotlin.Any!> {
-        public constructor Super</*0*/ A : kotlin.Any!>()
-
-        public/*package*/ open inner class Inner /*captured type parameters: /*0*/ A : kotlin.Any!*/ {
-            public/*package*/ constructor Inner()
-            public/*package*/ open fun get(): test.ReturnInnerSubclassOfSupersInner.Super<A!>!
-        }
-    }
-}
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.kt b/compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.kt
index 6c5ccc84d01..e26150ff298 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.kt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.kt
@@ -2,8 +2,10 @@
 
 package test
 
+import java.io.Serializable
+
 annotation class A
 
-interface Foo<T : @A Number> : @A CharSequence {
+interface Foo<T : @A Number> : @A Serializable {
     fun <E, F : @A E> bar()
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.txt
index a1da2fa8f48..be5cf693978 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.txt
@@ -4,10 +4,6 @@ public final annotation class A : kotlin.Annotation {
     /*primary*/ public constructor A()
 }
 
-public interface Foo</*0*/ T : @test.A kotlin.Number> : @test.A kotlin.CharSequence {
-    public abstract override /*1*/ /*fake_override*/ val length: kotlin.Int
-        public abstract override /*1*/ /*fake_override*/ fun <get-length>(): kotlin.Int
+public interface Foo</*0*/ T : @test.A kotlin.Number> : @test.A java.io.Serializable {
     public abstract fun </*0*/ E, /*1*/ F : @test.A E> bar(): kotlin.Unit
-    public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.Char
-    public abstract override /*1*/ /*fake_override*/ fun subSequence(/*0*/ startIndex: kotlin.Int, /*1*/ endIndex: kotlin.Int): kotlin.CharSequence
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.kt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.kt
index 51894a75600..a4efb2d6954 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.kt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.kt
@@ -1,3 +1,5 @@
+// FULL_JDK
+
 package test
 
 public abstract class ClassDoesNotOverrideMethod() : java.util.Date() {
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.kt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.kt
index c0adfb71eb4..e3e05080f94 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.kt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.kt
@@ -1,3 +1,5 @@
+// FULL_JDK
+
 package test
 
 public abstract class ClassWithTypePExtendsIterableP<P>() : kotlin.collections.MutableIterable<P> {
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.kt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.kt
index 833add25e23..15ed2dc5e7d 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.kt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.kt
@@ -1,3 +1,5 @@
+// FULL_JDK
+
 package test
 
 public interface HalfSubstitutedTypeParameters {
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.kt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.kt
index 891dfb4eb00..b7fad065d15 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.kt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.kt
@@ -1,3 +1,5 @@
+// FULL_JDK
+
 package test
 
 public interface SubclassOfCollection<E>: MutableCollection<E> {