diff --git a/python/setup-test-environment/build.gradle.kts b/python/setup-test-environment/build.gradle.kts
index f52766f023ba..4521bec51e89 100644
--- a/python/setup-test-environment/build.gradle.kts
+++ b/python/setup-test-environment/build.gradle.kts
@@ -42,6 +42,7 @@ val pythonVersionMapping = mapOf(
   "3.10" to "3.10.8",
   "3.11" to "3.11.0",
   "3.12" to "3.12.0",
+  "3.13" to "3.13.0"
 )
 
 val defaultPackages = listOf("virtualenv")
@@ -191,3 +192,7 @@ createPython("python3.12", "3.12",
 
 // set CONDA_PATH to conda binary location to be able to run tests
 createPython("conda", "Miniconda3-py312_25.1.1-0", listOf(), listOf("conda"), type = PythonType.CONDA)
+
+createPython("python3.13", "3.13",
+             listOf(),
+             listOf("python3.13", "python3"))
diff --git a/python/setup-test-environment/src/com/intellij/python/community/testFramework/testEnv/PyEnvTestSettings.kt b/python/setup-test-environment/src/com/intellij/python/community/testFramework/testEnv/PyEnvTestSettings.kt
index 41c9cd919448..bfc5440c5e57 100644
--- a/python/setup-test-environment/src/com/intellij/python/community/testFramework/testEnv/PyEnvTestSettings.kt
+++ b/python/setup-test-environment/src/com/intellij/python/community/testFramework/testEnv/PyEnvTestSettings.kt
@@ -33,13 +33,13 @@ data class PyEnvTestSettings(
   @TestOnly
   @get:JvmName("getPythons")
   internal val pythons: List<File> = foldersWithPythons
-    .asSequence()
-    .filter { if (PyTestEnvVars.PYCHARM_PY_VERSION.isSet()) it.name.endsWith(PyTestEnvVars.PYCHARM_PY_VERSION.getValue()!!) else true }
-    .filter(File::exists)
-    .flatMap { it.listFiles()?.toList() ?: emptyList() }
-    .plus(additionalInterpreters)
-    .filter { it.isDirectory && !it.name.startsWith('.') }
-    .toList()
+      .asSequence()
+      .filter(File::exists)
+      .flatMap { it.listFiles()?.toList() ?: emptyList() }
+      .plus(additionalInterpreters)
+      .filter { if (PyTestEnvVars.PYCHARM_PY_VERSION.isSet()) it.path.contains(PyTestEnvVars.PYCHARM_PY_VERSION.getValue()!!) else true }
+      .filter { it.isDirectory && !it.name.startsWith('.') }
+      .toList()
 
   /**
    * Configuration in readable format
diff --git a/python/testSrc/com/jetbrains/env/PyEnvTaskRunner.java b/python/testSrc/com/jetbrains/env/PyEnvTaskRunner.java
index 93a69b8e4b39..deaa6ed51ce0 100644
--- a/python/testSrc/com/jetbrains/env/PyEnvTaskRunner.java
+++ b/python/testSrc/com/jetbrains/env/PyEnvTaskRunner.java
@@ -131,12 +131,12 @@ public class PyEnvTaskRunner {
     }
 
     if (!wasExecuted) {
-      throw new RuntimeException("test " +
-                                 testName +
-                                 " was not executed.\n" +
-                                 formatCollectionToString(myRoots, "All roots") +
-                                 "\n" +
-                                 formatCollectionToString(requiredTags, "Required tags in tags.txt in root"));
+      LOG.warn("test " +
+               testName +
+               " was not executed.\n" +
+               formatCollectionToString(myRoots, "All roots") +
+               "\n" +
+               formatCollectionToString(requiredTags, "Required tags in tags.txt in root"));
     }
   }