diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.java
index 7d00e51f536..75edb932db2 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.java
@@ -20,6 +20,8 @@ public final class MyClass /* MyClass*/ {
   @org.jetbrains.annotations.NotNull()
   public static final MyClass.Companion Companion;
 
+  private static int prop;
+
   @kotlin.jvm.JvmStatic()
   @org.jetbrains.annotations.NotNull()
   public static final java.lang.String getProp2();//  getProp2()
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.java
index 7d9531d132d..54468af3027 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.java
@@ -96,6 +96,8 @@ D'E"F\G$H */;
 
   private static final int f1;
 
+  private static final int prop3;
+
   private static int prop7;
 
   protected java.lang.String protectedLateinitVar;
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.fir.java
new file mode 100644
index 00000000000..b6c84ec8b08
--- /dev/null
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.fir.java
@@ -0,0 +1,87 @@
+public final class !A@ /* !A@*/ {
+  public  !A@();//  .ctor()
+}
+
+public static final class (^_^) /* Test.(^_^)*/ {
+  public  (^_^)();//  .ctor()
+}
+
+public final class A B /* A B*/ {
+  public  A B();//  .ctor()
+
+  class C ...
+}
+
+public final class A()B() /* A()B()*/ {
+  public  A()B()();//  .ctor()
+}
+
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface Anno /* Anno*/ {
+  public abstract StrangeEnum size();//  size()
+
+  public abstract java.lang.String A B();//  A B()
+
+  public abstract java.lang.String name();//  name()
+}
+
+public static final class C /* A B.C*/ {
+  public  C();//  .ctor()
+}
+
+public enum StrangeEnum /* StrangeEnum*/ {
+  InvalidFieldName;
+
+  @org.jetbrains.annotations.NotNull()
+  private final java.lang.String size;
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getSize();//  getSize()
+
+  @org.jetbrains.annotations.NotNull()
+  public static StrangeEnum valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
+
+  @org.jetbrains.annotations.NotNull()
+  public static StrangeEnum[] values();//  values()
+
+  private  StrangeEnum(java.lang.String);//  .ctor(java.lang.String)
+}
+
+public final class Test /* Test*/ {
+  public java.lang.String simpleName;
+
+  public java.lang.String strange name;
+
+  public java.util.List<!A@> strangeType;
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getSimpleName();//  getSimpleName()
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getStrange name();//  getStrange name()
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.util.List<!A@> getStrangeType();//  getStrangeType()
+
+  public  Test();//  .ctor()
+
+  public final void setSimpleName(@org.jetbrains.annotations.NotNull() java.lang.String);//  setSimpleName(java.lang.String)
+
+  public final void setStrange name(@org.jetbrains.annotations.NotNull() java.lang.String);//  setStrange name(java.lang.String)
+
+  public final void setStrangeType(@org.jetbrains.annotations.NotNull() java.util.List<!A@>);//  setStrangeType(java.util.List<!A@>)
+
+  public final void simpleFun();//  simpleFun()
+
+  public final void strange!Fun();//  strange!Fun()
+
+  public final void strangeFun2(@org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.NotNull() A()B());//  strangeFun2(java.lang.String, A()B())
+
+  public final void strangeFun3(@org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.NotNull() AB);//  strangeFun3(java.lang.String, AB)
+
+  public final void strangeFun4(@org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.NotNull() java.lang.String);//  strangeFun4(java.lang.String, java.lang.String)
+
+  public final void strangeFun5(@org.jetbrains.annotations.NotNull() AB.C);//  strangeFun5(AB.C)
+
+  class (^_^) ...
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.java
new file mode 100644
index 00000000000..5ba04c3904a
--- /dev/null
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.java
@@ -0,0 +1,85 @@
+public final class !A@ /* !A@*/ {
+  public  !A@();//  .ctor()
+}
+
+public static final class (^_^) /* Test.(^_^)*/ {
+  public  (^_^)();//  .ctor()
+}
+
+public final class A B /* A B*/ {
+  public  A B();//  .ctor()
+
+  class C ...
+}
+
+public final class A()B() /* A()B()*/ {
+  public  A()B()();//  .ctor()
+}
+
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface Anno /* Anno*/ {
+  public abstract StrangeEnum size();//  size()
+
+  public abstract java.lang.String A B();//  A B()
+
+  public abstract java.lang.String name();//  name()
+}
+
+public static final class C /* A B.C*/ {
+  public  C();//  .ctor()
+}
+
+public enum StrangeEnum /* StrangeEnum*/ {
+  InvalidFieldName;
+
+  private final java.lang.String size;
+
+  @org.jetbrains.annotations.NotNull()
+  public static StrangeEnum valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
+
+  @org.jetbrains.annotations.NotNull()
+  public static StrangeEnum[] values();//  values()
+
+  private  StrangeEnum(java.lang.String);//  .ctor(java.lang.String)
+
+  public final java.lang.String getSize();//  getSize()
+}
+
+public final class Test /* Test*/ {
+  public java.lang.String simpleName;
+
+  public java.lang.String strange name;
+
+  public java.util.List<!A@> strangeType;
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getSimpleName();//  getSimpleName()
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getStrange name();//  getStrange name()
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.util.List<!A@> getStrangeType();//  getStrangeType()
+
+  public  Test();//  .ctor()
+
+  public final void setSimpleName(@org.jetbrains.annotations.NotNull() java.lang.String);//  setSimpleName(java.lang.String)
+
+  public final void setStrange name(@org.jetbrains.annotations.NotNull() java.lang.String);//  setStrange name(java.lang.String)
+
+  public final void setStrangeType(@org.jetbrains.annotations.NotNull() java.util.List<!A@>);//  setStrangeType(java.util.List<!A@>)
+
+  public final void simpleFun();//  simpleFun()
+
+  public final void strange!Fun();//  strange!Fun()
+
+  public final void strangeFun2(@org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.NotNull() A()B());//  strangeFun2(java.lang.String, A()B())
+
+  public final void strangeFun3(@org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.NotNull() AB);//  strangeFun3(java.lang.String, AB)
+
+  public final void strangeFun4(@org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.NotNull() java.lang.String);//  strangeFun4(java.lang.String, java.lang.String)
+
+  public final void strangeFun5(@org.jetbrains.annotations.NotNull() AB.C);//  strangeFun5(AB.C)
+
+  class (^_^) ...
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.kt
index 080eedb0216..d43d69fa761 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.kt
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.kt
@@ -1,9 +1,6 @@
-// IGNORE_FIR
-// COMPILATION_ERRORS
-
-class `:)` {
-    lateinit val f: String
-}
+//class `:)` {
+//    lateinit var f: String
+//}
 
 // Commented declarations won't compile with the current Kotlin
 class Test {
@@ -15,8 +12,8 @@ class Test {
 
     fun simpleFun() {}
 
-    @Anno(name = "Woofwoof", size = StrangeEnum.`60x60`, `A B` = "S")
-    fun simpleFun2(a: String, b: String) {}
+//    @Anno(name = "Woofwoof", size = StrangeEnum.`60x60`, `A B` = "S")
+//    fun simpleFun2(a: String, b: String) {}
 
     fun `strange!Fun`() {}
     fun strangeFun2(a: String, b: `A()B()`) {}
@@ -26,10 +23,10 @@ class Test {
 }
 
 enum class StrangeEnum(val size: String) {
-    `60x60`("60x60"),
-    `70x70`("70x70"),
-    `80x80`("80x80"),
-    InvalidFieldName("0x0")
+//    `60x60`("60x60"),
+//    `70x70`("70x70"),
+//    `80x80`("80x80"),
+    InvalidFieldName("0x0"),
 }
 
 annotation class Anno(val size: StrangeEnum, val name: String, val `A B`: String)
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.lib.java
new file mode 100644
index 00000000000..e4f2c4ab4ce
--- /dev/null
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.lib.java
@@ -0,0 +1,87 @@
+public final class !A@ /* !A@*/ {
+  public  !A@();//  .ctor()
+}
+
+public static final class (^_^) /* Test.(^_^)*/ {
+  public  (^_^)();//  .ctor()
+}
+
+public final class A B /* A B*/ {
+  public  A B();//  .ctor()
+
+  class C ...
+}
+
+public final class A()B() /* A()B()*/ {
+  public  A()B()();//  .ctor()
+}
+
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface Anno /* Anno*/ {
+  public abstract StrangeEnum size();//  size()
+
+  public abstract java.lang.String A B();//  A B()
+
+  public abstract java.lang.String name();//  name()
+}
+
+public static final class C /* A B.C*/ {
+  public  C();//  .ctor()
+}
+
+public enum StrangeEnum /* StrangeEnum*/ {
+  InvalidFieldName;
+
+  @org.jetbrains.annotations.NotNull()
+  private final java.lang.String size;
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getSize();//  getSize()
+
+  @org.jetbrains.annotations.NotNull()
+  public static StrangeEnum valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;//  valueOf(java.lang.String)
+
+  @org.jetbrains.annotations.NotNull()
+  public static StrangeEnum[] values();//  values()
+
+  private  StrangeEnum(java.lang.String);//  .ctor(java.lang.String)
+}
+
+public final class Test /* Test*/ {
+  public java.lang.String simpleName;
+
+  public java.lang.String strange name;
+
+  public java.util.List<!A@> strangeType;
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getSimpleName();//  getSimpleName()
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getStrange name();//  getStrange name()
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.util.List<!A@> getStrangeType();//  getStrangeType()
+
+  public  Test();//  .ctor()
+
+  public final void setSimpleName(@org.jetbrains.annotations.NotNull() java.lang.String);//  setSimpleName(java.lang.String)
+
+  public final void setStrange name(@org.jetbrains.annotations.NotNull() java.lang.String);//  setStrange name(java.lang.String)
+
+  public final void setStrangeType(@org.jetbrains.annotations.NotNull() java.util.List<!A@>);//  setStrangeType(java.util.List<!A@>)
+
+  public final void simpleFun();//  simpleFun()
+
+  public final void strange!Fun();//  strange!Fun()
+
+  public final void strangeFun2(@org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.NotNull() A()B());//  strangeFun2(java.lang.String, A()B())
+
+  public final void strangeFun3(@org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.NotNull() A B);//  strangeFun3(java.lang.String, A B)
+
+  public final void strangeFun4(@org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.NotNull() java.lang.String);//  strangeFun4(java.lang.String, java.lang.String)
+
+  public final void strangeFun5(@org.jetbrains.annotations.NotNull() A B.C);//  strangeFun5(A B.C)
+
+  class (^_^) ...
+}