diff --git a/plugins/kotlin/code-insight/intentions-shared/resources/kotlin.code-insight.intentions.shared.xml b/plugins/kotlin/code-insight/intentions-shared/resources/kotlin.code-insight.intentions.shared.xml
index 55a62d207fd4..cd3e2e160bc6 100644
--- a/plugins/kotlin/code-insight/intentions-shared/resources/kotlin.code-insight.intentions.shared.xml
+++ b/plugins/kotlin/code-insight/intentions-shared/resources/kotlin.code-insight.intentions.shared.xml
@@ -433,5 +433,12 @@
       <bundleName>messages.KotlinBundle</bundleName>
       <categoryKey>group.names.kotlin</categoryKey>
     </intentionAction>
+
+    <intentionAction>
+      <language>kotlin</language>
+      <className>org.jetbrains.kotlin.idea.codeInsight.intentions.shared.ConvertNullablePropertyToLateinitIntention</className>
+      <bundleName>messages.KotlinBundle</bundleName>
+      <categoryKey>group.names.kotlin</categoryKey>
+    </intentionAction>
   </extensions>
 </idea-plugin>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertNullablePropertyToLateinitIntention.kt b/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/ConvertNullablePropertyToLateinitIntention.kt
similarity index 98%
rename from plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertNullablePropertyToLateinitIntention.kt
rename to plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/ConvertNullablePropertyToLateinitIntention.kt
index 6367fe5b476b..c342ccce3a17 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertNullablePropertyToLateinitIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/ConvertNullablePropertyToLateinitIntention.kt
@@ -1,6 +1,6 @@
 // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
-package org.jetbrains.kotlin.idea.intentions
+package org.jetbrains.kotlin.idea.codeInsight.intentions.shared
 
 import com.intellij.modcommand.ActionContext
 import com.intellij.modcommand.ModPsiUpdater
diff --git a/plugins/kotlin/code-insight/intentions-shared/tests/k1/test/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/SharedK1IntentionTestGenerated.java b/plugins/kotlin/code-insight/intentions-shared/tests/k1/test/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/SharedK1IntentionTestGenerated.java
index 5c5abbb88268..e1d1c464556d 100644
--- a/plugins/kotlin/code-insight/intentions-shared/tests/k1/test/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/SharedK1IntentionTestGenerated.java
+++ b/plugins/kotlin/code-insight/intentions-shared/tests/k1/test/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/SharedK1IntentionTestGenerated.java
@@ -725,6 +725,105 @@ public abstract class SharedK1IntentionTestGenerated extends AbstractSharedK1Int
         }
     }
 
+    @RunWith(JUnit3RunnerWithInners.class)
+    @TestMetadata("../testData/intentions/convertNullablePropertyToLateinit")
+    public static class ConvertNullablePropertyToLateinit extends AbstractSharedK1IntentionTest {
+        @java.lang.Override
+        @org.jetbrains.annotations.NotNull
+        public final KotlinPluginMode getPluginMode() {
+            return KotlinPluginMode.K1;
+        }
+
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+        }
+
+        @TestMetadata("abstract.kt")
+        public void testAbstract() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/abstract.kt");
+        }
+
+        @TestMetadata("delegate.kt")
+        public void testDelegate() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/delegate.kt");
+        }
+
+        @TestMetadata("extension.kt")
+        public void testExtension() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/extension.kt");
+        }
+
+        @TestMetadata("getter.kt")
+        public void testGetter() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/getter.kt");
+        }
+
+        @TestMetadata("inlineClass.kt")
+        public void testInlineClass() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/inlineClass.kt");
+        }
+
+        @TestMetadata("int.kt")
+        public void testInt() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/int.kt");
+        }
+
+        @TestMetadata("local.kt")
+        public void testLocal() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/local.kt");
+        }
+
+        @TestMetadata("localLegacy.kt")
+        public void testLocalLegacy() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/localLegacy.kt");
+        }
+
+        @TestMetadata("nonNullInitializer.kt")
+        public void testNonNullInitializer() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/nonNullInitializer.kt");
+        }
+
+        @TestMetadata("nonNullable.kt")
+        public void testNonNullable() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/nonNullable.kt");
+        }
+
+        @TestMetadata("nullableUpperBound.kt")
+        public void testNullableUpperBound() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/nullableUpperBound.kt");
+        }
+
+        @TestMetadata("setter.kt")
+        public void testSetter() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/setter.kt");
+        }
+
+        @TestMetadata("simple.kt")
+        public void testSimple() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/simple.kt");
+        }
+
+        @TestMetadata("topLevel.kt")
+        public void testTopLevel() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/topLevel.kt");
+        }
+
+        @TestMetadata("topLevelLegacy.kt")
+        public void testTopLevelLegacy() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/topLevelLegacy.kt");
+        }
+
+        @TestMetadata("unsignedInt.kt")
+        public void testUnsignedInt() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/unsignedInt.kt");
+        }
+
+        @TestMetadata("val.kt")
+        public void testVal() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/val.kt");
+        }
+    }
+
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../testData/intentions/convertOrdinaryPropertyToLazy")
     public static class ConvertOrdinaryPropertyToLazy extends AbstractSharedK1IntentionTest {
diff --git a/plugins/kotlin/code-insight/intentions-shared/tests/k2/test/org/jetbrains/kotlin/idea/k2/codeInsight/intentions/shared/SharedK2IntentionTestGenerated.java b/plugins/kotlin/code-insight/intentions-shared/tests/k2/test/org/jetbrains/kotlin/idea/k2/codeInsight/intentions/shared/SharedK2IntentionTestGenerated.java
index a3b622b0546e..51fa8f8e390c 100644
--- a/plugins/kotlin/code-insight/intentions-shared/tests/k2/test/org/jetbrains/kotlin/idea/k2/codeInsight/intentions/shared/SharedK2IntentionTestGenerated.java
+++ b/plugins/kotlin/code-insight/intentions-shared/tests/k2/test/org/jetbrains/kotlin/idea/k2/codeInsight/intentions/shared/SharedK2IntentionTestGenerated.java
@@ -725,6 +725,105 @@ public abstract class SharedK2IntentionTestGenerated extends AbstractSharedK2Int
         }
     }
 
+    @RunWith(JUnit3RunnerWithInners.class)
+    @TestMetadata("../testData/intentions/convertNullablePropertyToLateinit")
+    public static class ConvertNullablePropertyToLateinit extends AbstractSharedK2IntentionTest {
+        @java.lang.Override
+        @org.jetbrains.annotations.NotNull
+        public final KotlinPluginMode getPluginMode() {
+            return KotlinPluginMode.K2;
+        }
+
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+        }
+
+        @TestMetadata("abstract.kt")
+        public void testAbstract() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/abstract.kt");
+        }
+
+        @TestMetadata("delegate.kt")
+        public void testDelegate() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/delegate.kt");
+        }
+
+        @TestMetadata("extension.kt")
+        public void testExtension() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/extension.kt");
+        }
+
+        @TestMetadata("getter.kt")
+        public void testGetter() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/getter.kt");
+        }
+
+        @TestMetadata("inlineClass.kt")
+        public void testInlineClass() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/inlineClass.kt");
+        }
+
+        @TestMetadata("int.kt")
+        public void testInt() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/int.kt");
+        }
+
+        @TestMetadata("local.kt")
+        public void testLocal() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/local.kt");
+        }
+
+        @TestMetadata("localLegacy.kt")
+        public void testLocalLegacy() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/localLegacy.kt");
+        }
+
+        @TestMetadata("nonNullInitializer.kt")
+        public void testNonNullInitializer() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/nonNullInitializer.kt");
+        }
+
+        @TestMetadata("nonNullable.kt")
+        public void testNonNullable() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/nonNullable.kt");
+        }
+
+        @TestMetadata("nullableUpperBound.kt")
+        public void testNullableUpperBound() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/nullableUpperBound.kt");
+        }
+
+        @TestMetadata("setter.kt")
+        public void testSetter() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/setter.kt");
+        }
+
+        @TestMetadata("simple.kt")
+        public void testSimple() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/simple.kt");
+        }
+
+        @TestMetadata("topLevel.kt")
+        public void testTopLevel() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/topLevel.kt");
+        }
+
+        @TestMetadata("topLevelLegacy.kt")
+        public void testTopLevelLegacy() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/topLevelLegacy.kt");
+        }
+
+        @TestMetadata("unsignedInt.kt")
+        public void testUnsignedInt() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/unsignedInt.kt");
+        }
+
+        @TestMetadata("val.kt")
+        public void testVal() throws Exception {
+            runTest("../testData/intentions/convertNullablePropertyToLateinit/val.kt");
+        }
+    }
+
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../testData/intentions/convertOrdinaryPropertyToLazy")
     public static class ConvertOrdinaryPropertyToLazy extends AbstractSharedK2IntentionTest {
diff --git a/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/.intention b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/.intention
new file mode 100644
index 000000000000..df2c11839a87
--- /dev/null
+++ b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/.intention
@@ -0,0 +1 @@
+org.jetbrains.kotlin.idea.codeInsight.intentions.shared.ConvertNullablePropertyToLateinitIntention
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/abstract.kt b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/abstract.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/abstract.kt
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/abstract.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/delegate.kt b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/delegate.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/delegate.kt
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/delegate.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/extension.kt b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/extension.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/extension.kt
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/extension.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/getter.kt b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/getter.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/getter.kt
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/getter.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/inlineClass.kt b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/inlineClass.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/inlineClass.kt
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/inlineClass.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/int.kt b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/int.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/int.kt
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/int.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/local.kt b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/local.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/local.kt
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/local.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/local.kt.after b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/local.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/local.kt.after
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/local.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/localLegacy.kt b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/localLegacy.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/localLegacy.kt
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/localLegacy.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/nonNullInitializer.kt b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/nonNullInitializer.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/nonNullInitializer.kt
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/nonNullInitializer.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/nonNullable.kt b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/nonNullable.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/nonNullable.kt
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/nonNullable.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/nullableUpperBound.kt b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/nullableUpperBound.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/nullableUpperBound.kt
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/nullableUpperBound.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/setter.kt b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/setter.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/setter.kt
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/setter.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/simple.kt b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/simple.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/simple.kt
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/simple.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/simple.kt.after b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/simple.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/simple.kt.after
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/simple.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/topLevel.kt b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/topLevel.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/topLevel.kt
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/topLevel.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/topLevel.kt.after b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/topLevel.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/topLevel.kt.after
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/topLevel.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/topLevelLegacy.kt b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/topLevelLegacy.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/topLevelLegacy.kt
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/topLevelLegacy.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/unsignedInt.kt b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/unsignedInt.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/unsignedInt.kt
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/unsignedInt.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/val.kt b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/val.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/val.kt
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/convertNullablePropertyToLateinit/val.kt
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/intentions/K1IntentionTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/intentions/K1IntentionTestGenerated.java
index 41fd7503e21a..3c2a30c78849 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/intentions/K1IntentionTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/intentions/K1IntentionTestGenerated.java
@@ -6800,105 +6800,6 @@ public abstract class K1IntentionTestGenerated extends AbstractK1IntentionTest {
         }
     }
 
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("testData/intentions/convertNullablePropertyToLateinit")
-    public static class ConvertNullablePropertyToLateinit extends AbstractK1IntentionTest {
-        @java.lang.Override
-        @org.jetbrains.annotations.NotNull
-        public final KotlinPluginMode getPluginMode() {
-            return KotlinPluginMode.K1;
-        }
-
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        @TestMetadata("abstract.kt")
-        public void testAbstract() throws Exception {
-            runTest("testData/intentions/convertNullablePropertyToLateinit/abstract.kt");
-        }
-
-        @TestMetadata("delegate.kt")
-        public void testDelegate() throws Exception {
-            runTest("testData/intentions/convertNullablePropertyToLateinit/delegate.kt");
-        }
-
-        @TestMetadata("extension.kt")
-        public void testExtension() throws Exception {
-            runTest("testData/intentions/convertNullablePropertyToLateinit/extension.kt");
-        }
-
-        @TestMetadata("getter.kt")
-        public void testGetter() throws Exception {
-            runTest("testData/intentions/convertNullablePropertyToLateinit/getter.kt");
-        }
-
-        @TestMetadata("inlineClass.kt")
-        public void testInlineClass() throws Exception {
-            runTest("testData/intentions/convertNullablePropertyToLateinit/inlineClass.kt");
-        }
-
-        @TestMetadata("int.kt")
-        public void testInt() throws Exception {
-            runTest("testData/intentions/convertNullablePropertyToLateinit/int.kt");
-        }
-
-        @TestMetadata("local.kt")
-        public void testLocal() throws Exception {
-            runTest("testData/intentions/convertNullablePropertyToLateinit/local.kt");
-        }
-
-        @TestMetadata("localLegacy.kt")
-        public void testLocalLegacy() throws Exception {
-            runTest("testData/intentions/convertNullablePropertyToLateinit/localLegacy.kt");
-        }
-
-        @TestMetadata("nonNullInitializer.kt")
-        public void testNonNullInitializer() throws Exception {
-            runTest("testData/intentions/convertNullablePropertyToLateinit/nonNullInitializer.kt");
-        }
-
-        @TestMetadata("nonNullable.kt")
-        public void testNonNullable() throws Exception {
-            runTest("testData/intentions/convertNullablePropertyToLateinit/nonNullable.kt");
-        }
-
-        @TestMetadata("nullableUpperBound.kt")
-        public void testNullableUpperBound() throws Exception {
-            runTest("testData/intentions/convertNullablePropertyToLateinit/nullableUpperBound.kt");
-        }
-
-        @TestMetadata("setter.kt")
-        public void testSetter() throws Exception {
-            runTest("testData/intentions/convertNullablePropertyToLateinit/setter.kt");
-        }
-
-        @TestMetadata("simple.kt")
-        public void testSimple() throws Exception {
-            runTest("testData/intentions/convertNullablePropertyToLateinit/simple.kt");
-        }
-
-        @TestMetadata("topLevel.kt")
-        public void testTopLevel() throws Exception {
-            runTest("testData/intentions/convertNullablePropertyToLateinit/topLevel.kt");
-        }
-
-        @TestMetadata("topLevelLegacy.kt")
-        public void testTopLevelLegacy() throws Exception {
-            runTest("testData/intentions/convertNullablePropertyToLateinit/topLevelLegacy.kt");
-        }
-
-        @TestMetadata("unsignedInt.kt")
-        public void testUnsignedInt() throws Exception {
-            runTest("testData/intentions/convertNullablePropertyToLateinit/unsignedInt.kt");
-        }
-
-        @TestMetadata("val.kt")
-        public void testVal() throws Exception {
-            runTest("testData/intentions/convertNullablePropertyToLateinit/val.kt");
-        }
-    }
-
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("testData/intentions/convertObjectLiteralToClass")
     public static class ConvertObjectLiteralToClass extends AbstractK1IntentionTest {
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/.intention b/plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/.intention
deleted file mode 100644
index 1c84b0dc7070..000000000000
--- a/plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/.intention
+++ /dev/null
@@ -1 +0,0 @@
-org.jetbrains.kotlin.idea.intentions.ConvertNullablePropertyToLateinitIntention
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/.k2Intention b/plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/.k2Intention
deleted file mode 100644
index 88f35f32d478..000000000000
--- a/plugins/kotlin/idea/tests/testData/intentions/convertNullablePropertyToLateinit/.k2Intention
+++ /dev/null
@@ -1 +0,0 @@
-org.jetbrains.kotlin.idea.k2.codeinsight.intentions.ConvertNullablePropertyToLateinitIntention
diff --git a/plugins/kotlin/plugin/k1/resources/META-INF/inspections-fe10.xml b/plugins/kotlin/plugin/k1/resources/META-INF/inspections-fe10.xml
index 9fbb5e9be26d..4b7d09dc05a9 100644
--- a/plugins/kotlin/plugin/k1/resources/META-INF/inspections-fe10.xml
+++ b/plugins/kotlin/plugin/k1/resources/META-INF/inspections-fe10.xml
@@ -651,13 +651,6 @@
       <categoryKey>group.names.kotlin</categoryKey>
     </intentionAction>
 
-    <intentionAction>
-      <language>kotlin</language>
-      <className>org.jetbrains.kotlin.idea.intentions.ConvertNullablePropertyToLateinitIntention</className>
-      <bundleName>messages.KotlinBundle</bundleName>
-      <categoryKey>group.names.kotlin</categoryKey>
-    </intentionAction>
-
     <intentionAction>
       <language>kotlin</language>
       <className>org.jetbrains.kotlin.idea.intentions.ConvertLateinitPropertyToNullableIntention</className>