diff --git a/.github/workflows/build_and_test_workflow.yml b/.github/workflows/build_and_test_workflow.yml
index 42115c1b6dfc..c8b7239a4041 100644
--- a/.github/workflows/build_and_test_workflow.yml
+++ b/.github/workflows/build_and_test_workflow.yml
@@ -105,7 +105,7 @@ jobs:
       # https://github.com/yarnpkg/yarn/issues/8242#issuecomment-776561223
       # Increase network timeout for Windows, retry once if bootstrap fails
       - name: Run bootstrap
-        run: | 
+        run: |
           yarn cache clean
           yarn config set network-timeout 1000000 -g
           yarn osd bootstrap || yarn osd bootstrap
@@ -177,6 +177,14 @@ jobs:
           JOB: ci${{ matrix.group }}
           CACHE_DIR: ciGroup${{ matrix.group }}
 
+      - uses: actions/upload-artifact@v3
+        if: failure()
+        with:
+          name: failure-artifacts
+          path: |
+            test/*/failure_debug/
+            test/*/screenshots/
+
   functional-tests-windows:
     runs-on: windows-latest
     name: Run functional tests on Windows
@@ -216,7 +224,7 @@ jobs:
       # https://github.com/yarnpkg/yarn/issues/8242#issuecomment-776561223
       # Increase network timeout for Windows, retry once if bootstrap fails
       - name: Run bootstrap
-        run: | 
+        run: |
           yarn cache clean
           yarn config set network-timeout 1000000 -g
           yarn osd bootstrap || yarn osd bootstrap
@@ -233,6 +241,14 @@ jobs:
           JOB: ci${{ matrix.group }}
           CACHE_DIR: ciGroup${{ matrix.group }}
 
+      - uses: actions/upload-artifact@v3
+        if: failure()
+        with:
+          name: failure-artifacts-ci${{ matrix.group }}
+          path: |
+            test/*/failure_debug/
+            test/*/screenshots/
+
   build-min-artifact-tests-linux:
     runs-on: ubuntu-latest
     container: