diff --git a/compiler/testData/codegen/boxWithJava/jvmName.kt b/compiler/testData/codegen/boxWithJava/jvmName.kt
index c8e1c1661fc..d509b611bd3 100644
--- a/compiler/testData/codegen/boxWithJava/jvmName.kt
+++ b/compiler/testData/codegen/boxWithJava/jvmName.kt
@@ -1,7 +1,5 @@
 // FILE: FakePlatformName.java
 
-import kotlin.jvm.JvmName;
-
 public class FakePlatformName {
     @JvmName(name = "fake")
     public String foo() {
diff --git a/compiler/testData/codegen/boxWithJava/jvmStatic/annotations.kt b/compiler/testData/codegen/boxWithJava/jvmStatic/annotations.kt
index 9fe86d3c03b..dfbfe670231 100644
--- a/compiler/testData/codegen/boxWithJava/jvmStatic/annotations.kt
+++ b/compiler/testData/codegen/boxWithJava/jvmStatic/annotations.kt
@@ -1,6 +1,5 @@
 // FILE: Test.java
 
-import java.lang.String;
 import java.lang.annotation.Annotation;
 
 class Test {
@@ -31,8 +30,6 @@ class Test {
 
 // FILE: test.kt
 
-import kotlin.jvm.JvmStatic
-
 @Retention(AnnotationRetention.RUNTIME)
 annotation class testAnnotation
 
diff --git a/compiler/testData/codegen/boxWithJava/jvmStatic/enumCompanion.kt b/compiler/testData/codegen/boxWithJava/jvmStatic/enumCompanion.kt
index 857cd983d20..b25091ee2ed 100644
--- a/compiler/testData/codegen/boxWithJava/jvmStatic/enumCompanion.kt
+++ b/compiler/testData/codegen/boxWithJava/jvmStatic/enumCompanion.kt
@@ -20,8 +20,6 @@ class Test {
 
 // FILE: enumCompanionObject.kt
 
-import kotlin.jvm.JvmStatic
-
 enum class A {
     ;
     companion object {
diff --git a/compiler/testData/codegen/boxWithJava/jvmStatic/object.kt b/compiler/testData/codegen/boxWithJava/jvmStatic/object.kt
index ae861722998..b4b84c3e15c 100644
--- a/compiler/testData/codegen/boxWithJava/jvmStatic/object.kt
+++ b/compiler/testData/codegen/boxWithJava/jvmStatic/object.kt
@@ -22,8 +22,6 @@ class Test {
 
 // FILE: simpleObject.kt
 
-import kotlin.jvm.JvmStatic
-
 object A {
 
     val b: String = "OK"
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/call/disallowNullValueForNotNullField.kt b/compiler/testData/codegen/boxWithStdlib/reflection/call/disallowNullValueForNotNullField.kt
index 5374490ef68..869f8b39801 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/call/disallowNullValueForNotNullField.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/call/disallowNullValueForNotNullField.kt
@@ -1,13 +1,13 @@
 import kotlin.reflect.*
 import kotlin.reflect.jvm.*
-import kotlin.jvm.JvmStatic as static
 
 class A {
     private var foo: String = ""
 }
 
 object O {
-    private @static var bar: String = ""
+    @JvmStatic
+    private var bar: String = ""
 }
 
 class CounterTest<T>(t: T) {
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/call/incorrectNumberOfArguments.kt b/compiler/testData/codegen/boxWithStdlib/reflection/call/incorrectNumberOfArguments.kt
index fc459011d3e..c07820acd69 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/call/incorrectNumberOfArguments.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/call/incorrectNumberOfArguments.kt
@@ -1,4 +1,3 @@
-import kotlin.jvm.JvmStatic as static
 import kotlin.reflect.jvm.isAccessible
 import kotlin.reflect.KCallable
 import kotlin.reflect.KFunction
@@ -11,9 +10,11 @@ class A(private var bar: String = "") {
 }
 
 object O {
-    private @static var baz: String = ""
+    @JvmStatic
+    private var baz: String = ""
 
-    @static fun getBaz() = (O::class.members.single { it.name == "baz" } as KMutableProperty<*>).apply { isAccessible = true }
+    @JvmStatic
+    fun getBaz() = (O::class.members.single { it.name == "baz" } as KMutableProperty<*>).apply { isAccessible = true }
 
     fun getGetBaz() = O::class.members.single { it.name == "getBaz" } as KFunction<*>
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/call/platformStatic.kt b/compiler/testData/codegen/boxWithStdlib/reflection/call/jvmStatic.kt
similarity index 71%
rename from compiler/testData/codegen/boxWithStdlib/reflection/call/platformStatic.kt
rename to compiler/testData/codegen/boxWithStdlib/reflection/call/jvmStatic.kt
index ab668e16bf3..be25d4bd9a7 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/call/platformStatic.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/call/jvmStatic.kt
@@ -1,12 +1,12 @@
-import kotlin.jvm.JvmStatic as static
-
 object Obj {
-    @static fun foo() {}
+    @JvmStatic
+    fun foo() {}
 }
 
 class C {
     companion object {
-        @static fun bar() {}
+        @JvmStatic
+        fun bar() {}
     }
 }
 
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/call/platformStaticInObjectIncorrectReceiver.kt b/compiler/testData/codegen/boxWithStdlib/reflection/call/jvmStaticInObjectIncorrectReceiver.kt
similarity index 85%
rename from compiler/testData/codegen/boxWithStdlib/reflection/call/platformStaticInObjectIncorrectReceiver.kt
rename to compiler/testData/codegen/boxWithStdlib/reflection/call/jvmStaticInObjectIncorrectReceiver.kt
index c9c482f067e..f36ebc2a768 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/call/platformStaticInObjectIncorrectReceiver.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/call/jvmStaticInObjectIncorrectReceiver.kt
@@ -1,9 +1,12 @@
-import kotlin.jvm.JvmStatic as static
-
 object Obj {
-    @static fun foo(s: String) {}
-    @static fun bar() {}
-    @static fun sly(obj: Obj) {}
+    @JvmStatic
+    fun foo(s: String) {}
+
+    @JvmStatic
+    fun bar() {}
+
+    @JvmStatic
+    fun sly(obj: Obj) {}
 
     operator fun get(name: String) = Obj::class.members.single { it.name == name }
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/callBy/platformStaticInObject.kt b/compiler/testData/codegen/boxWithStdlib/reflection/callBy/jvmStaticInObject.kt
similarity index 86%
rename from compiler/testData/codegen/boxWithStdlib/reflection/callBy/platformStaticInObject.kt
rename to compiler/testData/codegen/boxWithStdlib/reflection/callBy/jvmStaticInObject.kt
index 362c6de1bfc..33ce67933a5 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/callBy/platformStaticInObject.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/callBy/jvmStaticInObject.kt
@@ -1,8 +1,8 @@
-import kotlin.jvm.JvmStatic as static
 import kotlin.test.assertEquals
 
 object Obj {
-    @static fun foo(a: String, b: String = "b") = a + b
+    @JvmStatic
+    fun foo(a: String, b: String = "b") = a + b
 }
 
 fun box(): String {
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic/companionObjectFunction.kt b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/jvmStatic/companionObjectFunction.kt
similarity index 91%
rename from compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic/companionObjectFunction.kt
rename to compiler/testData/codegen/boxWithStdlib/reflection/mapping/jvmStatic/companionObjectFunction.kt
index d33a772da9e..a1f4893e6fc 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic/companionObjectFunction.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/jvmStatic/companionObjectFunction.kt
@@ -1,11 +1,11 @@
-import kotlin.jvm.JvmStatic as static
 import kotlin.reflect.KFunction
 import kotlin.reflect.jvm.*
 import kotlin.test.*
 
 class C {
     companion object {
-        @static fun foo(s: String): Int = s.length
+        @JvmStatic
+        fun foo(s: String): Int = s.length
     }
 }
 
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic/objectFunction.kt b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/jvmStatic/objectFunction.kt
similarity index 84%
rename from compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic/objectFunction.kt
rename to compiler/testData/codegen/boxWithStdlib/reflection/mapping/jvmStatic/objectFunction.kt
index 44b710cdc92..056b06fc381 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic/objectFunction.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/jvmStatic/objectFunction.kt
@@ -1,10 +1,10 @@
-import kotlin.jvm.JvmStatic as static
 import kotlin.reflect.KFunction
 import kotlin.reflect.jvm.*
 import kotlin.test.assertEquals
 
 object O {
-    @static fun foo(s: String): Int = s.length
+    @JvmStatic
+    fun foo(s: String): Int = s.length
 }
 
 fun box(): String {
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/memberFunctions.kt b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/memberFunctions.kt
index dc07f282df4..91c27d93255 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/memberFunctions.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/memberFunctions.kt
@@ -1,4 +1,3 @@
-import kotlin.jvm.JvmStatic as static
 import kotlin.reflect.jvm.javaType
 import kotlin.test.assertEquals
 
@@ -7,7 +6,8 @@ class A {
 }
 
 object O {
-    @static fun bar(a: A): String = ""
+    @JvmStatic
+    fun bar(a: A): String = ""
 }
 
 fun box(): String {
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/parameterizedTypes.kt b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/parameterizedTypes.kt
index 0c63ccdbe2f..b86e7e774c2 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/parameterizedTypes.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/parameterizedTypes.kt
@@ -1,7 +1,6 @@
 // FULL_JDK
 
 import java.lang.reflect.ParameterizedType
-import kotlin.jvm.JvmStatic as static
 import kotlin.reflect.*
 import kotlin.reflect.jvm.javaType
 import kotlin.test.assertEquals
@@ -9,7 +8,8 @@ import kotlin.test.assertEquals
 class A(private var foo: List<String>)
 
 object O {
-    private @static var bar: List<String> = listOf()
+    @JvmStatic
+    private var bar: List<String> = listOf()
 }
 
 fun topLevel(): List<String> = listOf()
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/propertyAccessors.kt b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/propertyAccessors.kt
index 671632f96a7..ba37a5a0689 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/propertyAccessors.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/propertyAccessors.kt
@@ -1,4 +1,3 @@
-import kotlin.jvm.JvmStatic as static
 import kotlin.reflect.KMutableProperty
 import kotlin.reflect.jvm.javaType
 import kotlin.test.assertEquals
@@ -6,7 +5,8 @@ import kotlin.test.assertEquals
 class A(private var foo: String)
 
 object O {
-    private @static var bar: String = ""
+    @JvmStatic
+    private var bar: String = ""
 }
 
 fun box(): String {
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/properties/privatePlatformStaticVarInObject.kt b/compiler/testData/codegen/boxWithStdlib/reflection/properties/privateJvmStaticVarInObject.kt
similarity index 86%
rename from compiler/testData/codegen/boxWithStdlib/reflection/properties/privatePlatformStaticVarInObject.kt
rename to compiler/testData/codegen/boxWithStdlib/reflection/properties/privateJvmStaticVarInObject.kt
index 65b3e042dd0..d6434e551a7 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/properties/privatePlatformStaticVarInObject.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/properties/privateJvmStaticVarInObject.kt
@@ -1,9 +1,9 @@
 import kotlin.reflect.*
 import kotlin.reflect.jvm.*
-import kotlin.jvm.JvmStatic as static
 
 object Obj {
-    private @static var result: String = "Fail"
+    @JvmStatic
+    private var result: String = "Fail"
 }
 
 fun box(): String {
diff --git a/compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObject.java b/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObject.java
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObject.java
rename to compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObject.java
diff --git a/compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObject.kt b/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObject.kt
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObject.kt
rename to compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObject.kt
diff --git a/compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObject.txt b/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObject.txt
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObject.txt
rename to compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObject.txt
diff --git a/compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObjectProperty.java b/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObjectProperty.java
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObjectProperty.java
rename to compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObjectProperty.java
diff --git a/compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObjectProperty.kt b/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObjectProperty.kt
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObjectProperty.kt
rename to compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObjectProperty.kt
diff --git a/compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObjectProperty.txt b/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObjectProperty.txt
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObjectProperty.txt
rename to compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObjectProperty.txt
diff --git a/compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleObject.java b/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObject.java
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleObject.java
rename to compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObject.java
diff --git a/compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleObject.kt b/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObject.kt
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleObject.kt
rename to compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObject.kt
diff --git a/compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleObject.txt b/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObject.txt
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleObject.txt
rename to compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObject.txt
diff --git a/compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleObjectProperty.java b/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObjectProperty.java
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleObjectProperty.java
rename to compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObjectProperty.java
diff --git a/compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleObjectProperty.kt b/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObjectProperty.kt
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleObjectProperty.kt
rename to compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObjectProperty.kt
diff --git a/compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleObjectProperty.txt b/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObjectProperty.txt
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleObjectProperty.txt
rename to compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObjectProperty.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constOrJvmFieldProperty.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constOrJvmFieldProperty.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constOrJvmFieldProperty.kt
rename to compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constOrJvmFieldProperty.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constOrJvmFieldProperty.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constOrJvmFieldProperty.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constOrJvmFieldProperty.txt
rename to compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constOrJvmFieldProperty.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constructorProperty.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constructorProperty.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constructorProperty.kt
rename to compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constructorProperty.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constructorProperty.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constructorProperty.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constructorProperty.txt
rename to compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constructorProperty.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constructors.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constructors.kt
similarity index 89%
rename from compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constructors.kt
rename to compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constructors.kt
index 1894eba6e94..0934bce2178 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constructors.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constructors.kt
@@ -1,4 +1,3 @@
-import kotlin.jvm.JvmStatic
 class A {
     <!WRONG_ANNOTATION_TARGET!>@JvmStatic<!> constructor() {}
     inner class B {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constructors.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constructors.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constructors.txt
rename to compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constructors.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/finalAndAbstract.kt
similarity index 95%
rename from compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.kt
rename to compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/finalAndAbstract.kt
index bf771e68fe6..86022360bfa 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/finalAndAbstract.kt
@@ -1,6 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-import kotlin.jvm.JvmStatic
-
 abstract class A {
 
     open fun a() {}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/finalAndAbstract.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.txt
rename to compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/finalAndAbstract.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/functions.kt
similarity index 96%
rename from compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.kt
rename to compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/functions.kt
index 79ecaa549cd..6ea08aec8ff 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/functions.kt
@@ -1,6 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-import kotlin.jvm.JvmStatic
-
 class A {
     companion object {
         @JvmStatic fun a1() {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/functions.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.txt
rename to compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/functions.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/localFun.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/localFun.kt
similarity index 81%
rename from compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/localFun.kt
rename to compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/localFun.kt
index b5a621e1c0f..8c92c329c68 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/localFun.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/localFun.kt
@@ -1,6 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-import kotlin.jvm.JvmStatic
-
 fun main(args: Array<String>) {
     <!JVM_STATIC_NOT_IN_OBJECT!>@JvmStatic fun a()<!>{
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/localFun.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/localFun.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/localFun.txt
rename to compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/localFun.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/property.kt
similarity index 97%
rename from compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.kt
rename to compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/property.kt
index a341d629ad6..15bc8d1ad60 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/property.kt
@@ -1,6 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-import kotlin.jvm.JvmStatic
-
 open class B {
     public open val base1 : Int = 1
     public open val base2 : Int = 1
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/property.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.txt
rename to compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/property.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.kt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmNames.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.kt
rename to compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmNames.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.txt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmNames.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.txt
rename to compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmNames.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.kt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmNamesDuplicate.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.kt
rename to compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmNamesDuplicate.kt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.txt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmNamesDuplicate.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.txt
rename to compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmNamesDuplicate.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.kt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInClassObject.kt
similarity index 83%
rename from compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.kt
rename to compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInClassObject.kt
index 06a40f8e5c6..09f55e384e8 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInClassObject.kt
@@ -1,5 +1,3 @@
-import kotlin.jvm.JvmStatic
-
 open class Base {
     fun foo() {}
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.txt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInClassObject.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.txt
rename to compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInClassObject.txt
diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInObject.kt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInObject.kt
similarity index 87%
rename from compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInObject.kt
rename to compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInObject.kt
index 290609831ef..1515072eccc 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInObject.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInObject.kt
@@ -1,6 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-import kotlin.jvm.JvmStatic
-
 open class Base {
     fun `foo$default`(i: Int, mask: Int, mh: Any) {}
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInObject.txt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInObject.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInObject.txt
rename to compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInObject.txt
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java
index c824f6e2231..df740b8c020 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java
@@ -508,6 +508,57 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW
             }
         }
 
+        @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class JvmStatic extends AbstractDiagnosticsTestWithStdLib {
+            public void testAllFilesPresentInJvmStatic() throws Exception {
+                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic"), Pattern.compile("^(.+)\\.kt$"), true);
+            }
+
+            @TestMetadata("constOrJvmFieldProperty.kt")
+            public void testConstOrJvmFieldProperty() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constOrJvmFieldProperty.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("constructorProperty.kt")
+            public void testConstructorProperty() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constructorProperty.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("constructors.kt")
+            public void testConstructors() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constructors.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("finalAndAbstract.kt")
+            public void testFinalAndAbstract() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/finalAndAbstract.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("functions.kt")
+            public void testFunctions() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/functions.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("localFun.kt")
+            public void testLocalFun() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/localFun.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("property.kt")
+            public void testProperty() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/property.kt");
+                doTest(fileName);
+            }
+        }
+
         @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/kClass")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
@@ -559,57 +610,6 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW
             }
         }
 
-        @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class PlatformStatic extends AbstractDiagnosticsTestWithStdLib {
-            public void testAllFilesPresentInPlatformStatic() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic"), Pattern.compile("^(.+)\\.kt$"), true);
-            }
-
-            @TestMetadata("constOrJvmFieldProperty.kt")
-            public void testConstOrJvmFieldProperty() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constOrJvmFieldProperty.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("constructorProperty.kt")
-            public void testConstructorProperty() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constructorProperty.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("constructors.kt")
-            public void testConstructors() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constructors.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("finalAndAbstract.kt")
-            public void testFinalAndAbstract() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("functions.kt")
-            public void testFunctions() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("localFun.kt")
-            public void testLocalFun() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/localFun.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("property.kt")
-            public void testProperty() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.kt");
-                doTest(fileName);
-            }
-        }
-
         @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
@@ -691,33 +691,33 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW
             doTest(fileName);
         }
 
+        @TestMetadata("jvmNames.kt")
+        public void testJvmNames() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmNames.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("jvmNamesDuplicate.kt")
+        public void testJvmNamesDuplicate() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmNamesDuplicate.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("jvmOverloads.kt")
         public void testJvmOverloads() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("platformNames.kt")
-        public void testPlatformNames() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.kt");
+        @TestMetadata("jvmStaticInClassObject.kt")
+        public void testJvmStaticInClassObject() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInClassObject.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("platformNamesDuplicate.kt")
-        public void testPlatformNamesDuplicate() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("platformStaticInClassObject.kt")
-        public void testPlatformStaticInClassObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("platformStaticInObject.kt")
-        public void testPlatformStaticInObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInObject.kt");
+        @TestMetadata("jvmStaticInObject.kt")
+        public void testJvmStaticInObject() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmStaticInObject.kt");
             doTest(fileName);
         }
 
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxWithStdlibCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxWithStdlibCodegenTestGenerated.java
index 7c44160faf7..5b8d11059cd 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxWithStdlibCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxWithStdlibCodegenTestGenerated.java
@@ -3324,6 +3324,18 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
                 doTestWithStdlib(fileName);
             }
 
+            @TestMetadata("jvmStatic.kt")
+            public void testJvmStatic() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/jvmStatic.kt");
+                doTestWithStdlib(fileName);
+            }
+
+            @TestMetadata("jvmStaticInObjectIncorrectReceiver.kt")
+            public void testJvmStaticInObjectIncorrectReceiver() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/jvmStaticInObjectIncorrectReceiver.kt");
+                doTestWithStdlib(fileName);
+            }
+
             @TestMetadata("localClassMember.kt")
             public void testLocalClassMember() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/localClassMember.kt");
@@ -3336,18 +3348,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
                 doTestWithStdlib(fileName);
             }
 
-            @TestMetadata("platformStatic.kt")
-            public void testPlatformStatic() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/platformStatic.kt");
-                doTestWithStdlib(fileName);
-            }
-
-            @TestMetadata("platformStaticInObjectIncorrectReceiver.kt")
-            public void testPlatformStaticInObjectIncorrectReceiver() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/platformStaticInObjectIncorrectReceiver.kt");
-                doTestWithStdlib(fileName);
-            }
-
             @TestMetadata("privateProperty.kt")
             public void testPrivateProperty() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/privateProperty.kt");
@@ -3405,6 +3405,12 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
                 doTestWithStdlib(fileName);
             }
 
+            @TestMetadata("jvmStaticInObject.kt")
+            public void testJvmStaticInObject() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/jvmStaticInObject.kt");
+                doTestWithStdlib(fileName);
+            }
+
             @TestMetadata("manyArgumentsOnlyOneDefault.kt")
             public void testManyArgumentsOnlyOneDefault() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/manyArgumentsOnlyOneDefault.kt");
@@ -3435,12 +3441,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
                 doTestWithStdlib(fileName);
             }
 
-            @TestMetadata("platformStaticInObject.kt")
-            public void testPlatformStaticInObject() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/platformStaticInObject.kt");
-                doTestWithStdlib(fileName);
-            }
-
             @TestMetadata("primitiveDefaultValues.kt")
             public void testPrimitiveDefaultValues() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/primitiveDefaultValues.kt");
@@ -3981,23 +3981,23 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
                 doTestWithStdlib(fileName);
             }
 
-            @TestMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic")
+            @TestMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/jvmStatic")
             @TestDataPath("$PROJECT_ROOT")
             @RunWith(JUnit3RunnerWithInners.class)
-            public static class PlatformStatic extends AbstractBlackBoxCodegenTest {
-                public void testAllFilesPresentInPlatformStatic() throws Exception {
-                    KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic"), Pattern.compile("^(.+)\\.kt$"), true);
+            public static class JvmStatic extends AbstractBlackBoxCodegenTest {
+                public void testAllFilesPresentInJvmStatic() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/mapping/jvmStatic"), Pattern.compile("^(.+)\\.kt$"), true);
                 }
 
                 @TestMetadata("companionObjectFunction.kt")
                 public void testCompanionObjectFunction() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic/companionObjectFunction.kt");
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/jvmStatic/companionObjectFunction.kt");
                     doTestWithStdlib(fileName);
                 }
 
                 @TestMetadata("objectFunction.kt")
                 public void testObjectFunction() throws Exception {
-                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic/objectFunction.kt");
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/jvmStatic/objectFunction.kt");
                     doTestWithStdlib(fileName);
                 }
             }
@@ -4326,9 +4326,9 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
                 doTestWithStdlib(fileName);
             }
 
-            @TestMetadata("privatePlatformStaticVarInObject.kt")
-            public void testPrivatePlatformStaticVarInObject() throws Exception {
-                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/privatePlatformStaticVarInObject.kt");
+            @TestMetadata("privateJvmStaticVarInObject.kt")
+            public void testPrivateJvmStaticVarInObject() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/privateJvmStaticVarInObject.kt");
                 doTestWithStdlib(fileName);
             }
 
diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java
index bdec137e1d2..648ee36fc7d 100644
--- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java
@@ -137,6 +137,39 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
         }
     }
 
+    @TestMetadata("compiler/testData/compileJavaAgainstKotlin/jvmStatic")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class JvmStatic extends AbstractCompileJavaAgainstKotlinTest {
+        public void testAllFilesPresentInJvmStatic() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/jvmStatic"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+
+        @TestMetadata("simpleCompanionObject.kt")
+        public void testSimpleCompanionObject() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObject.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("simpleCompanionObjectProperty.kt")
+        public void testSimpleCompanionObjectProperty() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObjectProperty.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("simpleObject.kt")
+        public void testSimpleObject() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObject.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("simpleObjectProperty.kt")
+        public void testSimpleObjectProperty() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObjectProperty.kt");
+            doTest(fileName);
+        }
+    }
+
     @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -425,39 +458,6 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
         }
     }
 
-    @TestMetadata("compiler/testData/compileJavaAgainstKotlin/platformStatic")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class PlatformStatic extends AbstractCompileJavaAgainstKotlinTest {
-        public void testAllFilesPresentInPlatformStatic() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/platformStatic"), Pattern.compile("^(.+)\\.kt$"), true);
-        }
-
-        @TestMetadata("simpleClassObject.kt")
-        public void testSimpleClassObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObject.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("simpleClassObjectProperty.kt")
-        public void testSimpleClassObjectProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObjectProperty.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("simpleObject.kt")
-        public void testSimpleObject() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleObject.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("simpleObjectProperty.kt")
-        public void testSimpleObjectProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleObjectProperty.kt");
-            doTest(fileName);
-        }
-    }
-
     @TestMetadata("compiler/testData/compileJavaAgainstKotlin/property")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
diff --git a/idea/testData/checker/PlatformStaticUsagesRuntime.kt b/idea/testData/checker/JvmStaticUsagesRuntime.kt
similarity index 98%
rename from idea/testData/checker/PlatformStaticUsagesRuntime.kt
rename to idea/testData/checker/JvmStaticUsagesRuntime.kt
index 64b5f87d6bf..75497bc8086 100644
--- a/idea/testData/checker/PlatformStaticUsagesRuntime.kt
+++ b/idea/testData/checker/JvmStaticUsagesRuntime.kt
@@ -1,5 +1,3 @@
-import kotlin.jvm.JvmStatic
-
 <error descr="[WRONG_ANNOTATION_TARGET] This annotation is not applicable to target 'class'">@JvmStatic</error>
 class A {
     <error descr="[WRONG_ANNOTATION_TARGET] This annotation is not applicable to target 'companion object'">@JvmStatic</error>
diff --git a/idea/testData/checker/duplicateJvmSignature/functionAndProperty/topLevelMultifileRuntime.kt b/idea/testData/checker/duplicateJvmSignature/functionAndProperty/topLevelMultifileRuntime.kt
index 12c3859e62c..8fe5625beb2 100644
--- a/idea/testData/checker/duplicateJvmSignature/functionAndProperty/topLevelMultifileRuntime.kt
+++ b/idea/testData/checker/duplicateJvmSignature/functionAndProperty/topLevelMultifileRuntime.kt
@@ -2,12 +2,9 @@
 @file:JvmMultifileClass
 package test
 
-import kotlin.jvm.JvmName
-import kotlin.jvm.JvmMultifileClass
-
 <error descr="[CONFLICTING_JVM_DECLARATIONS] Platform declaration clash: The following declarations have the same JVM signature (getX()I):
     fun <get-x>(): Int
     fun getX(): Int">val x</error> = 1
 <error descr="[CONFLICTING_JVM_DECLARATIONS] Platform declaration clash: The following declarations have the same JVM signature (getX()I):
     fun <get-x>(): Int
-    fun getX(): Int">fun getX()</error> = 1
\ No newline at end of file
+    fun getX(): Int">fun getX()</error> = 1
diff --git a/idea/tests/org/jetbrains/kotlin/checkers/PsiCheckerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/checkers/PsiCheckerTestGenerated.java
index b53d35c8a86..2c34070527b 100644
--- a/idea/tests/org/jetbrains/kotlin/checkers/PsiCheckerTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/checkers/PsiCheckerTestGenerated.java
@@ -175,6 +175,12 @@ public class PsiCheckerTestGenerated extends AbstractPsiCheckerTest {
             doTest(fileName);
         }
 
+        @TestMetadata("JvmStaticUsagesRuntime.kt")
+        public void testJvmStaticUsagesRuntime() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/JvmStaticUsagesRuntime.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("LocalObjects.kt")
         public void testLocalObjects() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/LocalObjects.kt");
@@ -235,12 +241,6 @@ public class PsiCheckerTestGenerated extends AbstractPsiCheckerTest {
             doTest(fileName);
         }
 
-        @TestMetadata("PlatformStaticUsagesRuntime.kt")
-        public void testPlatformStaticUsagesRuntime() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/PlatformStaticUsagesRuntime.kt");
-            doTest(fileName);
-        }
-
         @TestMetadata("PrimaryConstructors.kt")
         public void testPrimaryConstructors() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/PrimaryConstructors.kt");