diff --git a/python/setup-test-environment/intellij.python.community.testFramework.testEnv.iml b/python/setup-test-environment/intellij.python.community.testFramework.testEnv.iml
index b48972697f97..c1beddc42a1d 100644
--- a/python/setup-test-environment/intellij.python.community.testFramework.testEnv.iml
+++ b/python/setup-test-environment/intellij.python.community.testFramework.testEnv.iml
@@ -10,10 +10,10 @@
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.python.community" />
-    <orderEntry type="module" module-name="intellij.platform.testFramework" />
     <orderEntry type="module" module-name="intellij.python.sdk" />
     <orderEntry type="module" module-name="intellij.platform.execution" />
     <orderEntry type="library" name="kotlin-reflect" level="project" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
   </component>
 </module>
\ No newline at end of file
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 596837906f5e..ad12e7d9da36 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
@@ -2,13 +2,14 @@
 package com.intellij.python.community.testFramework.testEnv
 
 import com.intellij.python.community.testFramework.testEnv.PyEnvTestSettings.Companion.PATH_TO_TEST_ENV_PYTHON_INTERPRETERS
-import com.intellij.testFramework.UsefulTestCase.IS_UNDER_TEAMCITY
 import com.intellij.util.SystemProperties
 import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.annotations.TestOnly
 import java.io.File
 
 
+private val IS_UNDER_TEAMCITY: Boolean = System.getenv("TEAMCITY_VERSION") != null
+
 /**
  * Configures env test environment using env vars and properties.
  * Environment variables are also used in gradle script (setup-test-environment)
diff --git a/python/setup-test-environment/src/com/intellij/python/community/testFramework/testEnv/TypeVanillaPython3.kt b/python/setup-test-environment/src/com/intellij/python/community/testFramework/testEnv/TypeVanillaPython3.kt
index d69569493c21..48f867080cef 100644
--- a/python/setup-test-environment/src/com/intellij/python/community/testFramework/testEnv/TypeVanillaPython3.kt
+++ b/python/setup-test-environment/src/com/intellij/python/community/testFramework/testEnv/TypeVanillaPython3.kt
@@ -6,7 +6,7 @@ import com.intellij.openapi.projectRoots.SdkType
 import com.intellij.openapi.projectRoots.impl.SdkConfigurationUtil
 import com.intellij.openapi.util.Disposer
 import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess
-import com.intellij.testFramework.utils.vfs.refreshAndGetVirtualFile
+import com.intellij.openapi.vfs.refreshAndFindVirtualFileOrDirectory
 import com.jetbrains.python.PyNames
 import com.jetbrains.python.PythonBinary
 import java.nio.file.Path
@@ -14,9 +14,8 @@ import java.nio.file.Path
 data object TypeVanillaPython3 : PythonType<PythonBinary>("python3") {
   override suspend fun createSdkFor(python: PythonBinary): Sdk = createSdk(python)
 
-  // TODO: DOC
   fun createSdk(python: PythonBinary): Sdk =
-    SdkConfigurationUtil.setupSdk(emptyArray(), python.refreshAndGetVirtualFile(),
+    SdkConfigurationUtil.setupSdk(emptyArray(), python.refreshAndFindVirtualFileOrDirectory()!!,
                                   SdkType.findByName(PyNames.PYTHON_SDK_ID_NAME)!!, null, null)
 
   // Python is directly executable