diff --git a/.github/workflows/bsd.yml b/.github/workflows/bsd.yml
index 7cbc50735d..4d0a7fb261 100644
--- a/.github/workflows/bsd.yml
+++ b/.github/workflows/bsd.yml
@@ -16,53 +16,57 @@ env:
   GO_VERSION_OPENBSD: "1.23.1"
   GO_VERSION_NETBSD: "123"
   GO_VERSION_DRAGONFLY: "1.23.3"
-  GO_VERSION_SOLARIS: "1.23.3"
   GNU_TAR_VERSION: "1.35"
 
-# See https://github.com/vmactions's "debug shell" section to debug the VMs below.
 jobs:
-  test:
-    name: e2e-tests
+  checkout:
+    name: Checkout the repository
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
         uses: actions/checkout@v4
 
-      - name: Run end-to-end tests on FreeBSD
+  test_freebsd:
+    name: Run end-to-end tests on FreeBSD
+    runs-on: ubuntu-latest
+    needs: checkout
+    steps:
+      - name: test-e2e
         uses: vmactions/freebsd-vm@v1
-        if: false # this already passes, so skip to test other BSDs faster
         with:
           copyback: false
           envs: 'GO_VERSION_FREEBSD GNU_TAR_VERSION'
           usesh: true
           prepare: |
             pkg update -f
-            pkg install -y bash curl gtar-${GNU_TAR_VERSION}p0-static git gmake gsed ggrep go${GO_VERSION_FREEBSD} python
-          run: | 
+            pkg install -y bash curl gtar git gmake gsed gnugrep go${GO_VERSION_FREEBSD} python
+          run: |
             set -eux
             mkdir bin
-            ln -s $(which go${GO_VERSION_FREEBSD}) bin/go
-            ln -s $(which ggrep) bin/grep
-            ln -s $(which gmake) bin/make
-            ln -s $(which gsed) bin/sed
-            ln -s $(which gtar) bin/tar
+            ln -s $(which go${GO_VERSION_FREEBSD}) $(pwd)/bin/go
+            ln -s $(which ggrep) $(pwd)/bin/grep
+            ln -s $(which gmake) $(pwd)/bin/make
+            ln -s $(which gsed) $(pwd)/bin/sed
+            ln -s $(which gtar) $(pwd)/bin/tar
             export PATH=$(pwd)/bin:$PATH
-            
+
             echo "::group::Print environment information"
-            freebsd-version
-            uname -a
             echo "GOOS: $(go env GOOS)"
             echo "GOARCH: $(go env GOARCH)"
             echo "::endgroup::"
-            
+
             echo "::group::Run End-to-End Tests"
             git config --global --add safe.directory $(pwd)
             gmake test-e2e
             echo "::endgroup::"
 
-      - name: Run end-to-end tests on OpenBSD
+  test_openbsd:
+    name: Run end-to-end tests on OpenBSD
+    runs-on: ubuntu-latest
+    needs: checkout
+    steps:
+      - name: test-e2e
         uses: vmactions/openbsd-vm@v1
-        if: false
         with:
           copyback: false
           envs: 'GO_VERSION_OPENBSD GNU_TAR_VERSION'
@@ -73,25 +77,29 @@ jobs:
           run: |
             set -eux
             mkdir bin
-            ln -s $(which ggrep) bin/grep
-            ln -s $(which gmake) bin/make
-            ln -s $(which gsed) bin/sed
-            ln -s $(which gtar) bin/tar
+            ln -s $(which ggrep) $(pwd)/bin/grep
+            ln -s $(which gmake) $(pwd)/bin/make
+            ln -s $(which gsed) $(pwd)/bin/sed
+            ln -s $(which gtar) $(pwd)/bin/tar
             export PATH=$(pwd)/bin:$PATH
-            
+
             echo "::group::Print environment information"
             echo "GOOS: $(go env GOOS)"
             echo "GOARCH: $(go env GOARCH)"
             echo "::endgroup::"
-            
+
             echo "::group::Run End-to-End Tests"
             git config --global --add safe.directory $(pwd)
             make test-e2e
             echo "::endgroup::"
 
-      - name: Run end-to-end tests on NetBSD
+  test_netbsd:
+    name: Run end-to-end tests on NetBSD
+    runs-on: ubuntu-latest
+    needs: checkout
+    steps:
+      - name: test-e2e
         uses: vmactions/netbsd-vm@v1
-        if: false
         with:
           copyback: false
           envs: 'GO_VERSION_NETBSD GNU_TAR_VERSION'
@@ -102,26 +110,30 @@ jobs:
           run: |
             set -eux
             mkdir bin
-            ln -s $(which go${GO_VERSION_NETBSD}) bin/go
-            ln -s $(which ggrep) bin/grep
-            ln -s $(which gmake) bin/make
-            ln -s $(which gsed) bin/sed
-            ln -s $(which gtar) bin/tar
+            ln -s $(which go${GO_VERSION_NETBSD}) $(pwd)/bin/go
+            ln -s $(which ggrep) $(pwd)/bin/grep
+            ln -s $(which gmake) $(pwd)/bin/make
+            ln -s $(which gsed) $(pwd)/bin/sed
+            ln -s $(which gtar) $(pwd)/bin/tar
             export PATH=$(pwd)/bin:$PATH
-            
+
             echo "::group::Print environment information"
             echo "GOOS: $(go env GOOS)"
             echo "GOARCH: $(go env GOARCH)"
             echo "::endgroup::"
-            
+
             echo "::group::Run End-to-End Tests"
             git config --global --add safe.directory $(pwd)
             make test-e2e
             echo "::endgroup::"
 
-      - name: Run end-to-end tests on DragonFly
+  test_dragonfly:
+    name: Run end-to-end tests on DragonFly
+    runs-on: ubuntu-latest
+    needs: checkout
+    steps:
+      - name: test-e2e
         uses: vmactions/dragonflybsd-vm@v1
-        if: false
         with:
           copyback: false
           envs: 'GO_VERSION_DRAGONFLY'
@@ -129,7 +141,7 @@ jobs:
           prepare: |
             pkg update && pkg upgrade -y
             pkg install -y bash wget gtar git gmake gsed gnugrep python3
-          run: | # DragonFly6.4 ships with Go 1.21.
+          run: |
             set -eux
             mkdir bin
             export PATH=$(pwd)/bin:$PATH
@@ -141,43 +153,12 @@ jobs:
             ln -s $(which gsed) $(pwd)/bin/sed
             ln -s $(which gtar) $(pwd)/bin/tar
             ln -s $(which python3) $(pwd)/bin/python
-            
-            echo "::group::Print environment information"
-            echo "GOOS: $(go env GOOS)"
-            echo "GOARCH: $(go env GOARCH)"
-            echo "::endgroup::"
-            
-            echo "::group::Run End-to-End Tests"
-            git config --global --add safe.directory $(pwd)
-            gmake test-e2e
-            echo "::endgroup::"
 
-      - name: Run end-to-end tests on Solaris
-        uses: vmactions/solaris-vm@v1
-        with:
-          copyback: false
-          envs: 'GO_VERSION_SOLARIS'
-          usesh: true
-          prepare: | # Solaris 11.4 ships with Go 1.17.
-            pkgutil -U
-            pkgutil -iy bash wget gtar git gmake gsed ggrep python33
-          run: |
-            set -eux
-            mkdir bin
-            wget https://go.dev/dl/go${GO_VERSION_SOLARIS}.solaris-amd64.tar.gz
-            gtar xzf go${GO_VERSION_SOLARIS}.solaris-amd64.tar.gz
-            ln -s $(pwd)/go/bin/go $(pwd)/bin/go
-            ln -s $(which ggrep) $(pwd)/bin/grep
-            ln -s $(which gmake) $(pwd)/bin/make
-            ln -s $(which gsed) $(pwd)/bin/sed
-            ln -s $(which gtar) $(pwd)/bin/tar
-            export PATH=$(pwd)/bin:$PATH
-            
             echo "::group::Print environment information"
             echo "GOOS: $(go env GOOS)"
             echo "GOARCH: $(go env GOARCH)"
             echo "::endgroup::"
-            
+
             echo "::group::Run End-to-End Tests"
             git config --global --add safe.directory $(pwd)
             gmake test-e2e
diff --git a/collector/fixtures/e2e-output-solaris.txt b/collector/fixtures/e2e-output-solaris.txt
deleted file mode 100644
index e69de29bb2..0000000000