diff --git a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/PyCharmProjectConfigurableStartupActivity.kt b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/PyCharmProjectConfigurableStartupActivity.kt
index aa6b8ad12bda..733e3124beba 100644
--- a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/PyCharmProjectConfigurableStartupActivity.kt
+++ b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/PyCharmProjectConfigurableStartupActivity.kt
@@ -47,6 +47,10 @@ class PyCharmProjectConfigurableStartupActivity : ProjectActivity {
           ep.groupId = PythonToolsConfigurable.ID
           ep.groupWeight = 40
         }
+        "com.intellij.python.ruff.RuffConfigurable" -> {
+          ep.groupId = PythonToolsConfigurable.ID
+          ep.groupWeight = 40
+        }
         "com.intellij.python.pyright.PyrightConfigurable" -> {
           ep.groupId = PythonToolsConfigurable.ID
           ep.groupWeight = 40
diff --git a/python/python-psi-impl/resources/intellij.python.psi.impl.xml b/python/python-psi-impl/resources/intellij.python.psi.impl.xml
index bbe6436cf7b5..d90f37822ad4 100644
--- a/python/python-psi-impl/resources/intellij.python.psi.impl.xml
+++ b/python/python-psi-impl/resources/intellij.python.psi.impl.xml
@@ -128,6 +128,7 @@
     <completion.contributor language="Python"
                             implementationClass="com.jetbrains.python.codeInsight.completion.PySuperMethodCompletionContributor"/>
     <completion.contributor language="Python"
+                            id="PyDocstringCompletionContributor"
                             implementationClass="com.jetbrains.python.codeInsight.completion.PyDocstringCompletionContributor"/>
     <completion.contributor language="Python" implementationClass="com.jetbrains.python.documentation.docstrings.DocStringTagCompletionContributor"/>
     <completion.contributor language="Python" implementationClass="com.jetbrains.python.documentation.docstrings.DocStringSectionHeaderCompletionContributor"/>
diff --git a/python/setup-test-environment/build.gradle.kts b/python/setup-test-environment/build.gradle.kts
index 617f9fb36d73..e58a7f578555 100644
--- a/python/setup-test-environment/build.gradle.kts
+++ b/python/setup-test-environment/build.gradle.kts
@@ -201,5 +201,5 @@ createPython("python3.12", "3.12",
 createPython("conda", "Miniconda3-py312_25.1.1-0", listOf(), listOf("conda"), type = PythonType.CONDA)
 
 createPython("python3.13", "3.13",
-             listOf(),
-             listOf("python3.13", "python3"))
+             listOf("ruff"),
+             listOf("python3.13", "python3", "ruff"))