diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 533a94d6be..0d5e33549d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -140,7 +140,14 @@ jobs:
       - name: List test
         run: python -m avocado --verbose list selftests/unit/* selftests/functional/* selftests/*sh
       - name: Run a subset of avocado's selftests
-        run: python -m avocado --show avocado run -- selftests/functional/basic.py:RunnerOperationTest.test_store_logging_stream_external
+        run: python -m avocado run --job-timeout=300 selftests/functional/basic.py
+      - name: Save logs
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: Test_logs
+          path: /Users/runner/avocado/job-results/latest/
+          retention-days: 1
       - run: echo "🥑 This job's status is ${{ job.status }}."
 
 
diff --git a/selftests/check.py b/selftests/check.py
index 4aa0da0b5d..5bd899f36a 100755
--- a/selftests/check.py
+++ b/selftests/check.py
@@ -833,6 +833,7 @@ def main(args):  # pylint: disable=W0621
     config = {
         "run.job_category": "avocado-selftests",
         "job.output.testlogs.statuses": ["FAIL", "ERROR", "INTERRUPT"],
+        "job.run.timeout": 650
     }
 
     # Workaround for travis problem on arm64 - https://github.com/avocado-framework/avocado/issues/4768