diff --git a/plugins/kotlin/code-insight/intentions-k2/tests/test/org/jetbrains/kotlin/idea/k2/intentions/tests/K2IntentionTestGenerated.java b/plugins/kotlin/code-insight/intentions-k2/tests/test/org/jetbrains/kotlin/idea/k2/intentions/tests/K2IntentionTestGenerated.java
index 053c6fa14af2..83bb684d3501 100644
--- a/plugins/kotlin/code-insight/intentions-k2/tests/test/org/jetbrains/kotlin/idea/k2/intentions/tests/K2IntentionTestGenerated.java
+++ b/plugins/kotlin/code-insight/intentions-k2/tests/test/org/jetbrains/kotlin/idea/k2/intentions/tests/K2IntentionTestGenerated.java
@@ -18,6 +18,54 @@ import org.junit.runner.RunWith;
 @TestDataPath("$CONTENT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public abstract class K2IntentionTestGenerated extends AbstractK2IntentionTest {
+    @RunWith(JUnit3RunnerWithInners.class)
+    @TestMetadata("../../../idea/tests/testData/intentions/addMissingClassKeyword")
+    public static class AddMissingClassKeyword extends AbstractK2IntentionTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+        }
+
+        @TestMetadata("abstract.kt")
+        public void testAbstract() throws Exception {
+            runTest("../../../idea/tests/testData/intentions/addMissingClassKeyword/abstract.kt");
+        }
+
+        @TestMetadata("annottion.kt")
+        public void testAnnottion() throws Exception {
+            runTest("../../../idea/tests/testData/intentions/addMissingClassKeyword/annottion.kt");
+        }
+
+        @TestMetadata("data.kt")
+        public void testData() throws Exception {
+            runTest("../../../idea/tests/testData/intentions/addMissingClassKeyword/data.kt");
+        }
+
+        @TestMetadata("dataHasClassKeyword.kt")
+        public void testDataHasClassKeyword() throws Exception {
+            runTest("../../../idea/tests/testData/intentions/addMissingClassKeyword/dataHasClassKeyword.kt");
+        }
+
+        @TestMetadata("enum.kt")
+        public void testEnum() throws Exception {
+            runTest("../../../idea/tests/testData/intentions/addMissingClassKeyword/enum.kt");
+        }
+
+        @TestMetadata("enumHasClassKeyword.kt")
+        public void testEnumHasClassKeyword() throws Exception {
+            runTest("../../../idea/tests/testData/intentions/addMissingClassKeyword/enumHasClassKeyword.kt");
+        }
+
+        @TestMetadata("inner.kt")
+        public void testInner() throws Exception {
+            runTest("../../../idea/tests/testData/intentions/addMissingClassKeyword/inner.kt");
+        }
+
+        @TestMetadata("sealed.kt")
+        public void testSealed() throws Exception {
+            runTest("../../../idea/tests/testData/intentions/addMissingClassKeyword/sealed.kt");
+        }
+    }
+
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../../idea/tests/testData/intentions/addNameToArgument")
     public static class AddNameToArgument extends AbstractK2IntentionTest {
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 801a99a19ff2..ca174b857bf2 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
@@ -63,5 +63,12 @@
       <categoryKey>group.names.kotlin</categoryKey>
     </intentionAction>
 
+    <intentionAction>
+      <language>kotlin</language>
+      <className>org.jetbrains.kotlin.idea.codeInsight.intentions.shared.AddMissingClassKeywordIntention</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/AddMissingClassKeywordIntention.kt b/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/AddMissingClassKeywordIntention.kt
similarity index 97%
rename from plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/AddMissingClassKeywordIntention.kt
rename to plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/AddMissingClassKeywordIntention.kt
index b2fa0fd4ca5c..c55d5e5e11e4 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/AddMissingClassKeywordIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/AddMissingClassKeywordIntention.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.openapi.editor.Editor
 import com.intellij.psi.PsiDocumentManager
diff --git a/plugins/kotlin/idea/tests/testData/intentions/addMissingClassKeyword/.intention b/plugins/kotlin/idea/tests/testData/intentions/addMissingClassKeyword/.intention
index 12fde8d657ff..5ce50f6131d6 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/addMissingClassKeyword/.intention
+++ b/plugins/kotlin/idea/tests/testData/intentions/addMissingClassKeyword/.intention
@@ -1 +1 @@
-org.jetbrains.kotlin.idea.intentions.AddMissingClassKeywordIntention
+org.jetbrains.kotlin.idea.codeInsight.intentions.shared.AddMissingClassKeywordIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/addMissingClassKeyword/.k2Intention b/plugins/kotlin/idea/tests/testData/intentions/addMissingClassKeyword/.k2Intention
new file mode 100644
index 000000000000..5ce50f6131d6
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/intentions/addMissingClassKeyword/.k2Intention
@@ -0,0 +1 @@
+org.jetbrains.kotlin.idea.codeInsight.intentions.shared.AddMissingClassKeywordIntention
\ No newline at end of file
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 66c26ee33a3e..77c4b8d7c761 100644
--- a/plugins/kotlin/plugin/k1/resources/META-INF/inspections-fe10.xml
+++ b/plugins/kotlin/plugin/k1/resources/META-INF/inspections-fe10.xml
@@ -1008,13 +1008,6 @@
       <categoryKey>group.names.kotlin</categoryKey>
     </intentionAction>
 
-    <intentionAction>
-      <language>kotlin</language>
-      <className>org.jetbrains.kotlin.idea.intentions.AddMissingClassKeywordIntention</className>
-      <bundleName>messages.KotlinBundle</bundleName>
-      <categoryKey>group.names.kotlin</categoryKey>
-    </intentionAction>
-
     <intentionAction>
       <language>kotlin</language>
       <className>org.jetbrains.kotlin.idea.intentions.ExpandBooleanExpressionIntention</className>
diff --git a/plugins/kotlin/util/test-generator-fir/test/org/jetbrains/kotlin/fir/testGenerator/codeinsight/GenerateK2IntentionTests.kt b/plugins/kotlin/util/test-generator-fir/test/org/jetbrains/kotlin/fir/testGenerator/codeinsight/GenerateK2IntentionTests.kt
index 0766921f41cd..7ec326503dfd 100644
--- a/plugins/kotlin/util/test-generator-fir/test/org/jetbrains/kotlin/fir/testGenerator/codeinsight/GenerateK2IntentionTests.kt
+++ b/plugins/kotlin/util/test-generator-fir/test/org/jetbrains/kotlin/fir/testGenerator/codeinsight/GenerateK2IntentionTests.kt
@@ -12,6 +12,7 @@ internal fun MutableTWorkspace.generateK2IntentionTests() {
     testGroup("code-insight/intentions-k2/tests", testDataPath = "../../..") {
         testClass<AbstractK2IntentionTest> {
             val pattern = Patterns.forRegex("^([\\w\\-_]+)\\.(kt|kts)$")
+            model("${idea}intentions/addMissingClassKeyword", pattern = pattern)
             model("${idea}intentions/addNameToArgument", pattern = pattern)
             model("${idea}intentions/addNamesToCallArguments", pattern = pattern)
             model("${idea}intentions/addNamesToFollowingArguments", pattern = pattern)