diff --git a/.github/workflows/test-suite-desktop-e2e.yml b/.github/workflows/test-suite-desktop-e2e.yml
index e693f56e3b..01ecc91d45 100644
--- a/.github/workflows/test-suite-desktop-e2e.yml
+++ b/.github/workflows/test-suite-desktop-e2e.yml
@@ -85,7 +85,7 @@ jobs:
         run: |
           docker compose pull
           docker compose up -d ${{ matrix.CONTAINERS }}
-          docker compose run test-run
+          yarn workspace @trezor/suite-desktop-core test:e2e ${{ env.TEST_FILE }}
 
       - name: cleanup
         env:
diff --git a/docker/docker-compose.suite-desktop-ci.yml b/docker/docker-compose.suite-desktop-ci.yml
index 68bb555609..dca97e7a0a 100644
--- a/docker/docker-compose.suite-desktop-ci.yml
+++ b/docker/docker-compose.suite-desktop-ci.yml
@@ -5,44 +5,10 @@ services:
     environment:
       - SDL_VIDEODRIVER=dummy
       - XDG_RUNTIME_DIR=/var/tmp
-
-  test-run:
-    environment:
-      - TEST_FILE=$TEST_FILE
-      - HEADLESS=true
-      - CURRENTS_PROJECT_ID=$CURRENTS_PROJECT_ID
-      - CURRENTS_RECORD_KEY=$CURRENTS_RECORD_KEY
-      - CURRENTS_CI_BUILD_ID=$CURRENTS_CI_BUILD_ID
-      - GITHUB_WORKFLOW=$GITHUB_WORKFLOW
-      - GITHUB_ACTION=$GITHUB_ACTION
-      - GITHUB_EVENT_NAME=$GITHUB_EVENT_NAME
-      - GITHUB_RUN_ID=$GITHUB_RUN_ID
-      - GITHUB_RUN_ATTEMPT=$GITHUB_RUN_ATTEMPT
-      - GITHUB_REPOSITORY=$GITHUB_REPOSITORY
-      - COMMIT_INFO_BRANCH=$COMMIT_INFO_BRANCH
-      - COMMIT_INFO_MESSAGE=$COMMIT_INFO_MESSAGE
-      - COMMIT_INFO_EMAIL=$COMMIT_INFO_EMAIL
-      - COMMIT_INFO_AUTHOR=$COMMIT_INFO_AUTHOR
-      - COMMIT_INFO_SHA=$COMMIT_INFO_SHA
-      - COMMIT_INFO_TIMESTAMP=$COMMIT_INFO_TIMESTAMP
-      - COMMIT_INFO_REMOTE=$COMMIT_INFO_REMOTE
-    image: registry.gitlab.com/satoshilabs/trezor/trezor-suite/base:latest
-    container_name: desktop-test-runner
-    ipc: host
-    network_mode: service:trezor-user-env-unix
-    working_dir: /trezor-suite
-    command: bash -c "yarn workspace @trezor/suite-desktop-core test:e2e $TEST_FILE"
-    volumes:
-      - ../:/trezor-suite
+    network_mode: host
 
   electrum-regtest:
     image: ghcr.io/trezor/electrs:latest
     volumes:
       - ../:/trezor-suite
     network_mode: service:trezor-user-env-unix
-
-  # coinjoin-backend:
-  #   image: ghcr.io/trezor/coinjoin-backend:latest
-  #   network_mode: service:trezor-user-env-unix
-  #   volumes:
-  #     - ../:/coinjoin-backend
diff --git a/docker/docker-compose.suite-desktop-test.yml b/docker/docker-compose.suite-desktop-test.yml
deleted file mode 100644
index 837f6a131d..0000000000
--- a/docker/docker-compose.suite-desktop-test.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-version: "3.9"
-services:
-  trezor-user-env-unix:
-    image: ghcr.io/trezor/trezor-user-env
-    environment:
-      - DISPLAY=$DISPLAY
-    volumes:
-      - /tmp/.X11-unix:/tmp/.X11-unix:rw
-
-  test-run:
-    environment:
-      - DISPLAY=$DISPLAY
-      - LOCAL_USER_ID=$LOCAL_USER_ID
-      - TEST_FILE=$TEST_FILE
-      - PWDEBUG=1
-    image: registry.gitlab.com/satoshilabs/trezor/trezor-suite/base:latest
-    ipc: host
-    network_mode: service:trezor-user-env-unix
-    working_dir: /trezor-suite
-    command: bash -c "yarn workspace @trezor/suite-desktop-core test:e2e $TEST_FILE"
-    volumes:
-      - ../:/trezor-suite
-      - /tmp/.X11-unix:/tmp/.X11-unix:rw
-
-  electrum-regtest:
-    image: ghcr.io/trezor/electrs:latest
-    volumes:
-      - ../:/trezor-suite
-    network_mode: service:trezor-user-env-unix
-
-  coinjoin-backend:
-    image: ghcr.io/trezor/coinjoin-backend:latest
-    network_mode: service:trezor-user-env-unix
-    volumes:
-      - ../:/coinjoin-backend
diff --git a/docker/docker-suite-desktop-test.sh b/docker/docker-suite-desktop-test.sh
deleted file mode 100755
index 20d7857c24..0000000000
--- a/docker/docker-suite-desktop-test.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2086
-
-set -e
-
-# todo: resolve selective xhost permissions
-# todo: resolve generated files permissions
-
-xhost +
-LOCAL_USER_ID="$(id -u "$USER")"
-export LOCAL_USER_ID
-export TEST_FILE=$1
-
-CONTAINERS="trezor-user-env-unix test-run"
-
-if [ "$1" == 'coinjoin' ]
-then
-    CONTAINERS="${CONTAINERS} coinjoin-backend"
-fi
-
-if [ "$1" == 'electrum' ]
-then
-    CONTAINERS="${CONTAINERS} electrum-regtest"
-fi
-
-echo "${CONTAINERS}"
-
-docker compose -f ./docker/docker-compose.suite-desktop-test.yml up --build --abort-on-container-exit --remove-orphans --force-recreate ${CONTAINERS}