diff --git a/platform/testFramework/junit5/src/RegistryKey.kt b/platform/testFramework/junit5/src/RegistryKey.kt
index 98b50273a86e..ca216bb171f4 100644
--- a/platform/testFramework/junit5/src/RegistryKey.kt
+++ b/platform/testFramework/junit5/src/RegistryKey.kt
@@ -10,7 +10,11 @@ import org.junit.jupiter.api.extension.ExtendWith
  * Sets the [value] for the [Registry] [key] before an annotated test method (or a class),
  * and reverts to the previous value after an annotated test method (or, respectively, a class).
  *
+ * This annotation is preferred over manual [Registry.get] + [com.intellij.openapi.util.registry.RegistryValue.setValue] calls
+ * as it automatically handles cleanup after test completion.
+ *
  * @see com.intellij.openapi.util.registry.RegistryValue.setValue
+ * @see TestDisposable alternative for manual registry value management
  */
 @TestOnly
 @Repeatable
diff --git a/platform/testFramework/junit5/src/TestApplication.kt b/platform/testFramework/junit5/src/TestApplication.kt
index 8890657c1168..d65511473819 100644
--- a/platform/testFramework/junit5/src/TestApplication.kt
+++ b/platform/testFramework/junit5/src/TestApplication.kt
@@ -1,4 +1,4 @@
-// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.testFramework.junit5
 
 import com.intellij.testFramework.junit5.fixture.TestFixtures
@@ -14,6 +14,10 @@ import org.junit.jupiter.api.extension.ExtendWith
  * i.e., after all tests were run.
  *
  * @see com.intellij.testFramework.junit5.showcase.JUnit5ApplicationTest
+ * @see RegistryKey for setting registry values in tests
+ * @see TestDisposable for injecting test-scoped disposables
+ * @see RunInEdt for running tests in EDT
+ * @see SystemProperty for setting system properties in tests
  */
 @TestOnly
 @Target(AnnotationTarget.CLASS)