diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0d7644f8..96af79d6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,18 +19,27 @@ defaults:
 
 jobs:
   test:
-    name: Test (${{ matrix.os.target_triple }})
-    runs-on: ${{ matrix.os.host == 'freebsd' && 'macOS-latest' || matrix.os.host }}
+    name: Test (${{ matrix.data.os.target_triple }})
+    runs-on: ${{ matrix.data.os.host }}
     continue-on-error: ${{ matrix.nightly == 'nightly' }}
     strategy:
       matrix:
         arch: [x86_64]
-        os:
-          - host: macOS-latest
-            target_triple: x86_64-apple-macos10.9
-
-          - host: windows-latest
-            target_triple: x86_64-pc-windows-msvc
+        data:
+          - os:
+              host: macOS-latest
+              target_triple: x86_64-apple-macos10.9
+
+          # - os:
+          #     host: windows-latest
+          #     target_triple: x86_64-pc-windows-msvc
+
+          - os:
+              target: freebsd
+              target_triple: x86_64-unknown-freebsd13.1
+              version: '13.1'
+              host: macOS-latest
+            cross_platform_actions: true
 
           # - macOS-latest
           # - ubuntu-latest
@@ -116,21 +125,17 @@ jobs:
         run: ./configure --llvm-path llvm-${{ matrix.llvm }} --statically-link-clang
 
       - name: Test
-        if: ${{ matrix.os != 'freebsd' }}
+        if: matrix.data.cross_platform_actions == false
         run: dub test --verror
 
-      # - name: Test FreeBSD
-      #   if: ${{ matrix.os == 'freebsd' }}
-      #   uses: cross-platform-actions/action@v0.0.1
-      #   with:
-      #     shell: bash
-      #     operating_system: freebsd
-      #     version: 12.2
-      #     environment_variables: DLP_COMPILER DLP_ARCH
-      #     run: |
-      #       sudo pkg update
-      #       sudo pkg install -y bash curl gnupg git llvm-90
-      #       ./.github/workflows/ci.sh
+      - name: Test
+        if: matrix.data.cross_platform_actions
+        uses: cross-platform-actions/action@v0.15.0
+        with:
+          shell: bash
+          operating_system: ${{ matrix.data.os.target }}
+          version: ${{ matrix.data.os.version }}
+          run: dub test --verror
 
   # create_release:
   #   name: Create Release