diff --git a/.github/workflows/ports_psoc6.yml b/.github/workflows/ports_psoc6.yml
index 6ee0f4846a42d..2f323e7a4519b 100644
--- a/.github/workflows/ports_psoc6.yml
+++ b/.github/workflows/ports_psoc6.yml
@@ -66,12 +66,14 @@ jobs:
         source tools/ci.sh && ci_psoc6_flash_multiple_devices ${{ matrix.board }} firmware.hex tools/psoc6/${{ runner.name }}-devs.yml
     - name: Run psoc6 multi test
       run: | 
+        devs=($(python tools/psoc6/get-devs.py port -b ${{ matrix.board }} -y tools/psoc6/${{ runner.name }}-devs.yml))
         cd tests
-        ./psoc6/run_psoc6_tests.sh --psoc6-multi
+        ./psoc6/run_psoc6_tests.sh --psoc6-multi --dev0 ${dev[0]} --dev1 ${dev[1]}
     - name: Run psoc6 tests
       run: | 
+        devs=($(python tools/psoc6/get-devs.py port -b ${{ matrix.board }} -y tools/psoc6/${{ runner.name }}-devs.yml))
         cd tests
-        ./psoc6/run_psoc6_tests.sh --psoc6
+        ./psoc6/run_psoc6_tests.sh --psoc6 --dev0 ${dev[0]} 
     # TODO: Enable when HIL is updgraded 
     # - name: Run all implemented tests
     #   if:  github.event_name == 'pull_request'