diff --git a/platform/remote-driver/test-sdk/intellij.driver.sdk.iml b/platform/remote-driver/test-sdk/intellij.driver.sdk.iml
index ff59374849d9..f36d063beaf0 100644
--- a/platform/remote-driver/test-sdk/intellij.driver.sdk.iml
+++ b/platform/remote-driver/test-sdk/intellij.driver.sdk.iml
@@ -38,6 +38,5 @@
     <orderEntry type="module" module-name="intellij.driver.model" />
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.platform.ui.jcef" />
-    <orderEntry type="module" module-name="intellij.terminal" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ui/components/common/dialogs/TerminalDialogUI.kt b/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ui/components/common/dialogs/TerminalDialogUI.kt
index c1ef5558d5da..5db0ae12d1dc 100644
--- a/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ui/components/common/dialogs/TerminalDialogUI.kt
+++ b/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ui/components/common/dialogs/TerminalDialogUI.kt
@@ -11,17 +11,32 @@ import com.intellij.driver.sdk.waitFor
 import org.intellij.lang.annotations.Language
 
 
-fun Finder.terminal(@Language("xpath") xpath: String = "//div[contains(@class, 'TerminalPanel') or contains(@class, 'ConsoleTerminalWidget')]"): TerminalDialogUI =
+fun Finder.terminal(@Language("xpath") xpath: String = "//div[contains(@class, 'TerminalToolWindow') or contains(@class, 'ConsoleTerminalWidget')]"): TerminalDialogUI =
   x(xpath, TerminalDialogUI::class.java)
 
 fun Finder.terminal(action: TerminalDialogUI.() -> Unit) {
-  x("//div[contains(@class, 'TerminalPanel') or contains(@class, 'ConsoleTerminalWidget')]", TerminalDialogUI::class.java).action()
+  x("//div[contains(@class, 'TerminalToolWindow') or contains(@class, 'ConsoleTerminalWidget')]", TerminalDialogUI::class.java).action()
+}
+
+fun Finder.terminalPanel(@Language("xpath") xpath: String = "//div[contains(@class, 'TerminalPanel')]"): TerminalPanelUi =
+  x(xpath, TerminalPanelUi::class.java)
+
+fun Finder.terminalPanel(action: TerminalPanelUi.() -> Unit) {
+  x("//div[contains(@class, 'TerminalPanel')]", TerminalPanelUi::class.java).action()
 }
 
 fun Driver.terminal(action: TerminalDialogUI.() -> Unit) {
   this.ui.terminal(action)
 }
 
+fun Driver.terminalPanel(action: TerminalPanelUi.() -> Unit) {
+  this.ui.terminalPanel(action)
+}
+
+class TerminalPanelUi(data: ComponentData) : UiComponent(data) {
+  val terminalView: TerminalViewImpl by lazy { driver.cast(component, TerminalViewImpl::class) }
+}
+
 class TerminalDialogUI(data: ComponentData) : UiComponent(data) {
   init {
     if (notPresent()) {
@@ -30,10 +45,6 @@ class TerminalDialogUI(data: ComponentData) : UiComponent(data) {
     waitFound()
   }
 
-  val terminalView: TerminalViewImpl by lazy { driver.cast(component, TerminalViewImpl::class) }
-
-
-
   val rdPortForwardingPanelWidget: RdPortForwardingPanelWidget
     get() = x(RdPortForwardingPanelWidget::class.java) { byJavaClass("com.jetbrains.thinclient.portForwarding.ThinClientPortForwardingPanelWidget") }
 
@@ -60,12 +71,12 @@ interface TerminalViewImpl {
   fun getActiveOutputModel() : TerminalOutputModel
 }
 
-@Remote("org.jetbrains.plugins.terminal.block.reworked.TerminalOutputModel")
+@Remote("org.jetbrains.plugins.terminal.view.TerminalOutputModel")
 interface TerminalOutputModel {
   val cursorOffset: TerminalOffset
 }
 
-@Remote("org.jetbrains.plugins.terminal.block.reworked.TerminalOffset",  plugin = "org.jetbrains.plugins.terminal")
+@Remote("org.jetbrains.plugins.terminal.view.TerminalOffset",  plugin = "org.jetbrains.plugins.terminal")
 interface TerminalOffset {
   fun toAbsolute(): Long
 }
\ No newline at end of file
diff --git a/plugins/terminal/frontend/src/com/intellij/terminal/frontend/view/TerminalView.kt b/plugins/terminal/frontend/src/com/intellij/terminal/frontend/view/TerminalView.kt
index 48714e3f8b84..778d400f6011 100644
--- a/plugins/terminal/frontend/src/com/intellij/terminal/frontend/view/TerminalView.kt
+++ b/plugins/terminal/frontend/src/com/intellij/terminal/frontend/view/TerminalView.kt
@@ -6,7 +6,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.flow.StateFlow
 import org.jetbrains.annotations.ApiStatus
-import org.jetbrains.plugins.terminal.block.reworked.TerminalOutputModel
 import org.jetbrains.plugins.terminal.session.TerminalGridSize
 import org.jetbrains.plugins.terminal.session.TerminalStartupOptions
 import org.jetbrains.plugins.terminal.view.TerminalOutputModel
@@ -125,10 +124,6 @@ interface TerminalView {
    */
   fun createSendTextBuilder(): TerminalSendTextBuilder
 
-  // todo
-
-  fun getActiveOutputModel(): TerminalOutputModel
-
   companion object {
     /**
      * The data context key for accessing the Terminal View from actions.
diff --git a/plugins/terminal/frontend/src/com/intellij/terminal/frontend/view/impl/TerminalViewImpl.kt b/plugins/terminal/frontend/src/com/intellij/terminal/frontend/view/impl/TerminalViewImpl.kt
index 7fc99a242914..b946067c80ca 100644
--- a/plugins/terminal/frontend/src/com/intellij/terminal/frontend/view/impl/TerminalViewImpl.kt
+++ b/plugins/terminal/frontend/src/com/intellij/terminal/frontend/view/impl/TerminalViewImpl.kt
@@ -123,10 +123,6 @@ class TerminalViewImpl(
     get() = getCurEditor().calculateTerminalSize()
   override val title: TerminalTitle = TerminalTitle()
 
-  @VisibleForTesting
-  override fun getActiveOutputModel(): TerminalOutputModel {
-    return outputModels.active.value
-  }
   private val mutableOutputModels: TerminalOutputModelsSetImpl
   override val outputModels: TerminalOutputModelsSet
 
@@ -602,8 +598,9 @@ class TerminalViewImpl(
     }
 
     @Suppress("unused")
+    @ApiStatus.Internal
     @VisibleForTesting
-    private fun getActiveOutputModel(): TerminalOutputModel {
+    fun getActiveOutputModel(): TerminalOutputModel {
       return outputModels.active.value
     }