diff --git a/.cirrus.yml b/.cirrus.yml
index affe8e0..a0c8143 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -4,6 +4,7 @@ env:
   CARGO_INCREMENTAL: '0'
   CARGO_NET_GIT_FETCH_WITH_CLI: 'true'
   CARGO_NET_RETRY: '10'
+  CARGO_REGISTRIES_CRATES_IO_PROTOCOL: 'sparse'
   CARGO_TERM_COLOR: always
   RUST_BACKTRACE: '1'
   RUSTDOCFLAGS: -D warnings
@@ -27,3 +28,34 @@ freebsd_task:
   test_script:
     - . $HOME/.cargo/env
     - cargo test --target $TARGET
+
+netbsd_task:
+  name: test ($TARGET)
+  compute_engine_instance:
+    image_project: pg-ci-images
+    # https://github.com/anarazel/pg-vm-images/blob/main/packer/netbsd.pkrvars.hcl
+    image: family/pg-ci-netbsd-vanilla-9-3
+    platform: netbsd
+  env:
+    TARGET: x86_64-unknown-netbsd
+  setup_script:
+    - pkgin -y install git
+    - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain stable
+  test_script:
+    - . $HOME/.cargo/env
+    - cargo test
+
+openbsd_task:
+  name: test ($TARGET)
+  compute_engine_instance:
+    image_project: pg-ci-images
+    # https://github.com/anarazel/pg-vm-images/blob/main/packer/openbsd.pkrvars.hcl
+    image: family/pg-ci-openbsd-vanilla-7-2
+    platform: openbsd
+  env:
+    TARGET: x86_64-unknown-openbsd
+  setup_script:
+    # OpenBSD is tier 3 target, so install rust from package manager instead of rustup
+    - pkg_add git rust
+  test_script:
+    - cargo test
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ad55e23..2227486 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -79,7 +79,7 @@ jobs:
       run: rustup update stable
     - name: Install cross
       uses: taiki-e/install-action@cross
-    # We don't test BSDs, since we already test them in Cirrus/vmactions.
+    # We don't test BSDs, since we already test them in Cirrus.
     - name: Android
       if: startsWith(matrix.os, 'ubuntu')
       run: cross test --target arm-linux-androideabi
@@ -104,38 +104,6 @@ jobs:
         rustup target add x86_64-unknown-illumos
         cargo build --target x86_64-unknown-illumos
 
-  openbsd:
-    runs-on: macos-12
-    steps:
-    - uses: actions/checkout@v3
-    - name: Test OpenBSD
-      id: test
-      uses: vmactions/openbsd-vm@v0
-      with:
-        envs: CARGO_INCREMENTAL CARGO_NET_GIT_FETCH_WITH_CLI CARGO_NET_RETRY RUST_BACKTRACE RUSTFLAGS RUSTDOCFLAGS RUSTUP_MAX_RETRIES
-        usesh: true
-        # OpenBSD is tier 3 target, so install rust from package manager instead of rustup
-        prepare: |
-          pkg_add git rust
-        run: |
-          cargo test
-
-  dragonfly:
-    runs-on: macos-12
-    steps:
-    - uses: actions/checkout@v3
-    - name: Test Dragonfly BSD
-      id: test
-      uses: vmactions/dragonflybsd-vm@v0
-      with:
-        envs: CARGO_INCREMENTAL CARGO_NET_GIT_FETCH_WITH_CLI CARGO_NET_RETRY RUST_BACKTRACE RUSTFLAGS RUSTDOCFLAGS RUSTUP_MAX_RETRIES
-        usesh: true
-        # Dragonfly BSD is tier 3 target, so install rust from package manager instead of rustup
-        prepare: |
-          pkg install -y git rust
-        run: |
-          cargo test
-
   msrv:
     runs-on: ${{ matrix.os }}
     strategy: