diff --git a/.github/workflows/ports_psoc6.yml b/.github/workflows/ports_psoc6.yml
index 9256465d056c3..40a7149e8b33d 100644
--- a/.github/workflows/ports_psoc6.yml
+++ b/.github/workflows/ports_psoc6.yml
@@ -59,8 +59,15 @@ jobs:
         cp ../../mpy-psoc6_${{ matrix.board }}_${{ needs.server-build.outputs.commit_sha }}/firmware.hex .
         source mpy-psoc6.sh && openocd_download_install && openocd_board_conf_download ${{ matrix.board }} && mpy_firmware_deploy ${{ matrix.board }} firmware.hex
         cd ../..
-    - name: Run tests
-      run: cd tests && ./run-tests.py --target psoc6 --device /dev/ttyACM0 -d psoc6
+        cd tests
+    - name: Run psoc6 tests
+      run: ./psoc6/run_psoc6_test.sh --psoc6
+    - name: Run psoc6 multi test
+      run:  ./psoc6/run_psoc6_test.sh --psoc6-multi
+    - name: Run all implemented tests
+      # if:  github.event_name == 'pull_request'
+      continue-on-error: true
+      run: ./psoc6/run_psoc6_tests.sh -i
 
   release:
     runs-on: ubuntu-latest