diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinClassAnnotationTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinClassAnnotationTest.java
deleted file mode 100644
index 3fcffb0e0ea..00000000000
--- a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinClassAnnotationTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.codegen;
-
-import org.jetbrains.kotlin.load.java.JvmAnnotationNames;
-import org.jetbrains.kotlin.name.FqName;
-import org.jetbrains.kotlin.name.FqNameUnsafe;
-import org.jetbrains.kotlin.serialization.ClassData;
-import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil;
-import org.jetbrains.kotlin.test.ConfigurationKind;
-
-import java.lang.annotation.Annotation;
-import java.util.Arrays;
-import java.util.Set;
-
-import static org.jetbrains.kotlin.codegen.KotlinPackageAnnotationTest.collectCallableNames;
-
-public class KotlinClassAnnotationTest extends CodegenTestCase {
-    public static final FqName PACKAGE_NAME = new FqName("test");
-    public static final FqNameUnsafe CLASS_NAME = new FqNameUnsafe("A");
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.JDK_ONLY);
-    }
-
-    public void testClassKotlinInfo() throws Exception {
-        loadText("package " + PACKAGE_NAME + "\n" +
-                 "\n" +
-                 "class " + CLASS_NAME + " {\n" +
-                 "    fun foo() {}\n" +
-                 "    fun bar() = 42\n" +
-                 "}\n");
-        Class aClass = generateClass(PACKAGE_NAME + "." + CLASS_NAME);
-
-        Class<? extends Annotation> annotationClass = loadAnnotationClassQuietly(JvmAnnotationNames.KOTLIN_CLASS.asString());
-        assertTrue(aClass.isAnnotationPresent(annotationClass));
-        Annotation kotlinClass = aClass.getAnnotation(annotationClass);
-
-        String[] data = (String[]) CodegenTestUtil.getAnnotationAttribute(kotlinClass, "data");
-        assertNotNull(data);
-        String[] strings = (String[]) CodegenTestUtil.getAnnotationAttribute(kotlinClass, "strings");
-        assertNotNull(strings);
-        ClassData classData = JvmProtoBufUtil.readClassDataFrom(data, strings);
-
-        Set<String> callableNames = collectCallableNames(
-                classData.getClassProto().getFunctionList(),
-                classData.getClassProto().getPropertyList(),
-                classData.getNameResolver()
-        );
-        assertSameElements(Arrays.asList("foo", "bar"), callableNames);
-    }
-}
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java
deleted file mode 100644
index 8b79284aaa2..00000000000
--- a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.codegen;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.load.java.JvmAnnotationNames;
-import org.jetbrains.kotlin.name.FqName;
-import org.jetbrains.kotlin.serialization.PackageData;
-import org.jetbrains.kotlin.serialization.ProtoBuf;
-import org.jetbrains.kotlin.serialization.deserialization.NameResolver;
-import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil;
-import org.jetbrains.kotlin.test.ConfigurationKind;
-
-import java.lang.annotation.Annotation;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-public class KotlinPackageAnnotationTest extends CodegenTestCase {
-    public static final FqName PACKAGE_NAME = new FqName("test");
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.JDK_ONLY);
-    }
-
-    public void testPackagePartKotlinInfo() throws Exception {
-        loadText("package " + PACKAGE_NAME + "\n" +
-                 "\n" +
-                 "fun foo() = 42\n" +
-                 "val bar = 239\n" +
-                 "\n" +
-                 "class A\n" +
-                 "class B\n" +
-                 "object C\n");
-        Class aClass = generateFileClass();
-
-        Class<? extends Annotation> annotationClass = loadAnnotationClassQuietly(JvmAnnotationNames.KOTLIN_FILE_FACADE.asString());
-        assertTrue(aClass.isAnnotationPresent(annotationClass));
-
-        Annotation kotlinPackage = aClass.getAnnotation(annotationClass);
-
-        String[] data = (String[]) CodegenTestUtil.getAnnotationAttribute(kotlinPackage, "data");
-        assertNotNull(data);
-        String[] strings = (String[]) CodegenTestUtil.getAnnotationAttribute(kotlinPackage, "strings");
-        assertNotNull(strings);
-        PackageData packageData = JvmProtoBufUtil.readPackageDataFrom(data, strings);
-
-        Set<String> callableNames = collectCallableNames(
-                packageData.getPackageProto().getFunctionList(),
-                packageData.getPackageProto().getPropertyList(),
-                packageData.getNameResolver()
-        );
-        assertSameElements(callableNames, Arrays.asList("foo", "bar"));
-    }
-
-    @NotNull
-    public static Set<String> collectCallableNames(
-            @NotNull List<ProtoBuf.Function> functions,
-            @NotNull List<ProtoBuf.Property> properties,
-            @NotNull NameResolver nameResolver
-    ) {
-        Set<String> callableNames = new HashSet<String>();
-        for (ProtoBuf.Function function : functions) {
-            callableNames.add(nameResolver.getName(function.getName()).asString());
-        }
-        for (ProtoBuf.Property property : properties) {
-            callableNames.add(nameResolver.getName(property.getName()).asString());
-        }
-        return callableNames;
-    }
-}