diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 8529e34..83f0aa6 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -62,9 +62,11 @@ jobs:
       - name: Setup .NET 7
         uses: actions/setup-dotnet@main
         with:
-          dotnet-version: 7.0.306 # TEMP FIX: SDK 7.0.400 broke the Android builds
-      - name: Setup .NET workloads
+          dotnet-version: 7.x
+      - name: Setup .NET workload android
         run: dotnet workload install android
+      - name: Setup .NET workload wasm-tools
+        run: dotnet workload install wasm-tools
       - name: Setup JDK 17
         uses: actions/setup-java@main
         with:
@@ -86,13 +88,6 @@ jobs:
             !**/*.nupkg
             !**/*.snupkg
           if-no-files-found: error
-      - name: Publish tests
-        uses: actions/upload-artifact@main
-        with:
-          name: Test assemblies
-          path: Tests/bin/${{ github.event_name != 'workflow_dispatch' && 'Debug' || inputs.build_configuration }}
-          if-no-files-found: error
-          retention-days: 1
       - name: Publish NuGet packages
         uses: actions/upload-artifact@main
         with:
@@ -101,6 +96,14 @@ jobs:
             PDFtoZPL/bin/${{ github.event_name != 'workflow_dispatch' && 'Debug' || inputs.build_configuration }}/*.nupkg
             PDFtoZPL/bin/${{ github.event_name != 'workflow_dispatch' && 'Debug' || inputs.build_configuration }}/*.snupkg
           if-no-files-found: error
+      - name: Publish tests
+        uses: actions/upload-artifact@main
+        if: success() && (github.event_name != 'workflow_dispatch' && true || inputs.run_tests) == true
+        with:
+          name: Test assemblies
+          path: Tests/bin/${{ github.event_name != 'workflow_dispatch' && 'Debug' || inputs.build_configuration }}
+          if-no-files-found: error
+          retention-days: 1
   test:
     name: Test (${{ matrix.os }})
     needs: build
@@ -193,11 +196,13 @@ jobs:
       - name: Setup .NET 7
         uses: actions/setup-dotnet@main
         with:
-          dotnet-version: 7.0.306 # TEMP FIX: SDK 7.0.400 broke the Android builds
+          dotnet-version: 7.x
       - name: Setup dotnet-coverage
         run: dotnet tool install --global dotnet-coverage
-      - name: Setup .NET workload Android
+      - name: Setup .NET workload android
         run: dotnet workload install android
+      - name: Setup .NET workload wasm-tools
+        run: dotnet workload install wasm-tools
       - name: Setup JDK 17
         uses: actions/setup-java@main
         with:
diff --git a/.github/workflows/githubpages.yml b/.github/workflows/githubpages.yml
index 66689fc..fb81f9e 100644
--- a/.github/workflows/githubpages.yml
+++ b/.github/workflows/githubpages.yml
@@ -96,4 +96,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@main
+        uses: actions/deploy-pages@main
\ No newline at end of file