diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 282548bea..ab5c9786c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -69,12 +69,19 @@ jobs:
           --enable-linuxspi
       - name: Build
         run: make -C _ambuild -j$(nproc)
+      - name: "avrdude -? (not installed)"
+        run: _ambuild/avrdude -?
+      - name: "Dryrun test (not installed)"
+        run: printf "\n\n" | ./tools/test-avrdude -v -e _ambuild/avrdude -c '-C _ambuild/avrdude.conf' -d0 -p"-cdryrun -pm2560" -p"-cdryrun -pavr64du28"
       - name: Install
         run: sudo make -C _ambuild install
-      - name: Dryrun_test
-        run: printf "\n\n" | ./tools/test-avrdude -e _ambuild/avrdude -c '-C _ambuild/avrdude.conf' -d0 -p"-cdryrun -pm2560" -p"-cdryrun -pavr64du28"
-      - name: distcheck
-        run: make -C _ambuild -j$(nproc) distcheck
+      - name: "Dryrun test (installed)"
+        run: >-
+          export LD_LIBRARY_PATH="/usr/local/lib";
+          printf "\n\n" | ./tools/test-avrdude -v -d0 -p"-cdryrun -pm2560" -p"-cdryrun -pavr64du28"
+      # Re-enable distcheck after the doc fixes
+      # - name: distcheck
+      #   run: make -C _ambuild -j$(nproc) distcheck "DISTCHECK_CONFIGURE_FLAGS=--disable-doc"
 
   linux-x86_64:
     runs-on: ubuntu-latest
@@ -111,10 +118,14 @@ jobs:
           -B build
       - name: Build
         run: cmake --build build
+      - name: "avrdude -? (not installed)"
+        run: build/src/avrdude -?
+      - name: "Dryrun test (not installed)"
+        run: printf "\n\n" | ./tools/test-avrdude -v -e build/src/avrdude -c '-C build/src/avrdude.conf' -d0 -p"-cdryrun -pm2560" -p"-cdryrun -pavr64du28"
       - name: Install
         run: sudo cmake --build build --target install
-      - name: Dryrun_test
-        run: echo -e \\n | ./tools/test-avrdude -d0 -p"-cdryrun -pm2560" -p"-cdryrun -pavr64du28"        
+      - name: "Dryrun test (installed)"
+        run: printf "\n\n" | ./tools/test-avrdude -v -d0 -p"-cdryrun -pm2560" -p"-cdryrun -pavr64du28"
       - name: Archive build artifacts
         if: always()
         uses: actions/upload-artifact@v3
@@ -181,6 +192,9 @@ jobs:
           -B build
       - name: Build
         run: cmake --build build
+      - name: "avrdude -? (not installed)"
+        if: matrix.arch == 'i386'
+        run: build/src/avrdude -?
       - name: Archive build artifacts
         if: always()
         uses: actions/upload-artifact@v3
@@ -228,6 +242,10 @@ jobs:
           -B build
       - name: Build
         run: cmake --build build
+      - name: "avrdude -? (not installed)"
+        run: build/src/avrdude -?
+      - name: "Dryrun test (not installed)"
+        run: printf "\n\n" | ./tools/test-avrdude -v -e build/src/avrdude -c '-C build/src/avrdude.conf' -d0 -p"-cdryrun -pm2560" -p"-cdryrun -pavr64du28"
       - name: Archive build artifacts
         if: always()
         uses: actions/upload-artifact@v3
@@ -245,7 +263,7 @@ jobs:
             build/src/avrdude
             build/src/avrdude.conf
 
-  macos-x86_64_autotools:
+  macos-x86_64-autotools:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v3
@@ -277,7 +295,11 @@ jobs:
           
       - name: Build
         run: make -C _ambuild -j$(nproc)
-        
+      - name: "avrdude -? (not installed)"
+        run: _ambuild/avrdude -?
+      - name: "Dryrun test (not installed)"
+        run: printf "\n\n" | ./tools/test-avrdude -v -e _ambuild/avrdude -c '-C _ambuild/avrdude.conf' -d0 -p"-cdryrun -pm2560" -p"-cdryrun -pavr64du28"
+
   msvc:
     runs-on: windows-latest
     strategy:
@@ -309,6 +331,19 @@ jobs:
           -B build
       - name: Build
         run: cmake --build build --config ${{env.BUILD_TYPE}}
+      - name: "avrdude -? (not installed)"
+        # FIXME: Skip running avrdude.
+        #        The exe file on arm64 is not runnable - x86_64 perhaps?
+        if: matrix.arch != 'arm64'
+        run: build/src/${{env.BUILD_TYPE}}/avrdude.exe -?
+      - name: "Dryrun test (not installed)"
+        # FIXME: Skip running avrdude.
+        #        The exe file on arm64 is not runnable - x86_64 perhaps?
+        if: matrix.arch != 'arm64'
+        run: |
+          $tmp = [System.IO.Path]::GetTempPath()
+          $tmp_slash = $tmp -replace '\\', '/'
+          Write-Host "`n`n" -NoNewline | bash tools/test-avrdude -v -t "$tmp_slash" -e build/src/${{env.BUILD_TYPE}}/avrdude.exe -c "-C build/src/avrdude.conf" -d0 -p"-cdryrun -pm2560" -p"-cdryrun -pavr64du28"
       - name: Archive build artifacts
         if: always()
         uses: actions/upload-artifact@v3
@@ -320,8 +355,8 @@ jobs:
             !**/*.obj
       - name: Move executables
         run: |
-          mv build/src/RelWithDebInfo/avrdude.exe build/src
-          mv build/src/RelWithDebInfo/avrdude.pdb build/src
+          mv build/src/${{env.BUILD_TYPE}}/avrdude.exe build/src
+          mv build/src/${{env.BUILD_TYPE}}/avrdude.pdb build/src
       - name: Archive executables
         uses: actions/upload-artifact@v3
         with:
@@ -372,6 +407,11 @@ jobs:
           -B build
       - name: Build
         run: cmake --build build
+      - name: "avrdude -? (not installed)"
+        run: build/src/avrdude -?
+      # Disabled so far due to problems writing to temp files.
+      # - name: "Dryrun test (not installed)"
+      #   run: printf "\n\n" | ./tools/test-avrdude -v -e build/src/avrdude.exe -c "-C build/src/avrdude.conf" -d0 -p"-cdryrun -pm2560" -p"-cdryrun -pavr64du28"
       - name: Archive build artifacts
         if: always()
         uses: actions/upload-artifact@v3