diff --git a/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ProjectManager.kt b/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ProjectManager.kt
index cfc013f530db..3c25c5c04b7e 100644
--- a/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ProjectManager.kt
+++ b/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ProjectManager.kt
@@ -3,6 +3,7 @@ package com.intellij.driver.sdk
 import com.intellij.driver.client.Driver
 import com.intellij.driver.client.Remote
 import com.intellij.driver.client.service
+import com.intellij.driver.model.RdTarget
 
 @Remote("com.intellij.openapi.project.ProjectManager")
 interface ProjectManager {
@@ -13,9 +14,9 @@ fun Driver.getOpenProjects(): List<Project> {
   return service<ProjectManager>().getOpenProjects().toList()
 }
 
-fun Driver.singleProject(): Project {
+fun Driver.singleProject(rdTarget: RdTarget = RdTarget.DEFAULT): Project {
   return withContext {
-    service<ProjectManager>().getOpenProjects().singleOrNull() ?: throw IllegalStateException("No projects are opened")
+    service<ProjectManager>(rdTarget).getOpenProjects().singleOrNull() ?: throw IllegalStateException("No projects are opened")
   }
 }
 
diff --git a/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/RunContentManager.kt b/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/RunContentManager.kt
index 8ab5340f93df..f6b2ced22078 100644
--- a/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/RunContentManager.kt
+++ b/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/RunContentManager.kt
@@ -2,8 +2,9 @@ package com.intellij.driver.sdk
 
 import com.intellij.driver.client.Driver
 import com.intellij.driver.client.Remote
+import com.intellij.driver.model.RdTarget
 
-fun Driver.getRunContentManager(project: Project) = service(RunContentManager::class, project)
+fun Driver.getRunContentManager(project: Project) = service(RunContentManager::class, project, RdTarget.BACKEND)
 
 @Remote("com.intellij.execution.ui.RunContentManager")
 interface RunContentManager {