diff --git a/.github/workflows/BSD.yml b/.github/workflows/BSD.yml
index c451b2c..b0936bb 100644
--- a/.github/workflows/BSD.yml
+++ b/.github/workflows/BSD.yml
@@ -12,9 +12,9 @@ on:
     - cron: '0 0 1 * *'
 
 jobs:
-  test:
-    name: ${{ matrix.lisp }} on BSD
-    runs-on: macos-latest
+  test_freebsd:
+    name: ${{ matrix.lisp }} on FreeBSD
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
@@ -23,20 +23,15 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Run tests on OpenBSD
-        uses: vmactions/openbsd-vm@v0
+      - name: Run tests on FreeBSD
+        uses: vmactions/freebsd-vm@v1
         with:
           usesh: true
           sync: rsync
           copyback: false
           prepare: |
-            if [[ "${{ matrix.lisp }}" = "sbcl" ]]; then
-              /usr/sbin/pkg_add ${{ matrix.lisp }}--threads
-            else
-              /usr/sbin/pkg_add ${{ matrix.lisp }}
-            fi
-
-            /usr/sbin/pkg_add wget
+            sed 's/quarterly/latest/' /etc/pkg/FreeBSD.conf > /tmp/FreeBSD.conf && mv /tmp/FreeBSD.conf /etc/pkg/
+            pkg install -y ${{ matrix.lisp }} wget
             wget https://beta.quicklisp.org/quicklisp.lisp
             ${{ matrix.lisp }} --load quicklisp.lisp --eval '(progn (quicklisp-quickstart:install) (quit))'
           run: |
@@ -44,15 +39,31 @@ jobs:
             cp trivial-clock* ~/quicklisp/local-projects/cl-trivial-clock
             ${{ matrix.lisp }} --load ~/quicklisp/setup.lisp --eval "(ql:quickload :trivial-clock/test)" --eval "(progn (uiop:quit (if (uiop:symbol-call :fiveam '#:run! :trivial-clock) 0 1)))"
 
-      - name: Run tests on FreeBSD
-        uses: vmactions/freebsd-vm@v0.3.0
+  test_otherbsds:
+    name: ${{ matrix.lisp }} on other BSDs
+    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        lisp: [sbcl, ecl]
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Run tests on OpenBSD
+        uses: vmactions/openbsd-vm@v0
         with:
           usesh: true
           sync: rsync
           copyback: false
           prepare: |
-            sed 's/quarterly/latest/' /etc/pkg/FreeBSD.conf > /tmp/FreeBSD.conf && mv /tmp/FreeBSD.conf /etc/pkg/
-            pkg install -y ${{ matrix.lisp }} wget
+            if [[ "${{ matrix.lisp }}" = "sbcl" ]]; then
+              /usr/sbin/pkg_add ${{ matrix.lisp }}--threads
+            else
+              /usr/sbin/pkg_add ${{ matrix.lisp }}
+            fi
+
+            /usr/sbin/pkg_add wget
             wget https://beta.quicklisp.org/quicklisp.lisp
             ${{ matrix.lisp }} --load quicklisp.lisp --eval '(progn (quicklisp-quickstart:install) (quit))'
           run: |