diff --git a/java/java-features-trainer/resources/intellij.java.featuresTrainer.xml b/java/java-features-trainer/resources/intellij.java.featuresTrainer.xml
index be6e09a6c1ac..ddabbeb8be2c 100644
--- a/java/java-features-trainer/resources/intellij.java.featuresTrainer.xml
+++ b/java/java-features-trainer/resources/intellij.java.featuresTrainer.xml
@@ -4,4 +4,7 @@
     <ift.learning.course language="JAVA" implementationClass="com.intellij.java.ift.JavaLearningCourse"/>
     <ifs.suggesterSupport language="JAVA" implementationClass="com.intellij.java.ifs.JavaSuggesterSupport"/>
   </extensions>
+  <extensions defaultExtensionNs="com.intellij">
+    <lang.documentationProvider language="JAVA" implementationClass="com.intellij.java.featuresTrainer.onboarding.tips.JavaOnboardingTipsDocumentationProvider" order="first"/>
+  </extensions>
 </idea-plugin>
diff --git a/java/java-impl/src/com/intellij/lang/java/JavaOnboardingTipsDocumentationProvider.kt b/java/java-features-trainer/src/com/intellij/java/featuresTrainer/onboarding/tips/JavaOnboardingTipsDocumentationProvider.kt
similarity index 98%
rename from java/java-impl/src/com/intellij/lang/java/JavaOnboardingTipsDocumentationProvider.kt
rename to java/java-features-trainer/src/com/intellij/java/featuresTrainer/onboarding/tips/JavaOnboardingTipsDocumentationProvider.kt
index ae3d6be8316e..351154ff0905 100644
--- a/java/java-impl/src/com/intellij/lang/java/JavaOnboardingTipsDocumentationProvider.kt
+++ b/java/java-features-trainer/src/com/intellij/java/featuresTrainer/onboarding/tips/JavaOnboardingTipsDocumentationProvider.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.lang.java
+package com.intellij.java.featuresTrainer.onboarding.tips
 
 import com.intellij.lang.documentation.DocumentationProvider
 import com.intellij.openapi.util.TextRange
diff --git a/java/java-impl/src/META-INF/JavaPlugin.xml b/java/java-impl/src/META-INF/JavaPlugin.xml
index f5db6131af6d..82022a9a3c10 100644
--- a/java/java-impl/src/META-INF/JavaPlugin.xml
+++ b/java/java-impl/src/META-INF/JavaPlugin.xml
@@ -1315,7 +1315,6 @@
     <lang.importOptimizer language="JAVA" implementationClass="com.intellij.lang.java.JavaImportOptimizer"/>
     <lang.documentationFixer language="JAVA" implementationClass="com.intellij.codeInsight.documentation.JavaDocCommentFixer"/>
     <lang.documentationProvider language="JAVA" implementationClass="com.intellij.lang.java.JavaDocumentationProvider"/>
-    <lang.documentationProvider language="JAVA" implementationClass="com.intellij.lang.java.JavaOnboardingTipsDocumentationProvider" order="first"/>
     <lang.formatting.extractor language="JAVA" implementationClass="com.intellij.psi.codeStyle.extractor.differ.JavaExtractor"/>
     <lang.rearranger language="JAVA" implementationClass="com.intellij.psi.codeStyle.arrangement.JavaRearranger"/>
     <lang.whiteSpaceFormattingStrategy language="JAVA" implementationClass="com.intellij.psi.formatter.JavaWhiteSpaceFormattingStrategy"/>