diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml
index db1ddb337ac44d6ff85e4e9f8ae195405652d2e3..f337bae233d15c9bae5a7effb426cceddc0569f0 100644
--- a/.builds/freebsd.yml
+++ b/.builds/freebsd.yml
@@ -14,6 +14,36 @@ tasks:
   - test: |
       cd zig/build
       bin/zig test ../test/behavior.zig
+      bin/zig test ../std/special/compiler_rt/index.zig
+      bin/zig test ../std/index.zig
+
+      bin/zig test ../test/behavior.zig --library c
+      bin/zig test ../std/special/compiler_rt/index.zig --library c
+      bin/zig test ../std/index.zig --library c
+
+      bin/zig test ../test/behavior.zig --release-fast
+      bin/zig test ../std/special/compiler_rt/index.zig --release-fast
+      bin/zig test ../std/index.zig --release-fast
+
+      bin/zig test ../test/behavior.zig --release-fast --library c
+      bin/zig test ../std/special/compiler_rt/index.zig --release-fast --library c
+      bin/zig test ../std/index.zig --release-fast --library c
+
+      bin/zig test ../test/behavior.zig --release-small --library c
+      bin/zig test ../std/special/compiler_rt/index.zig --release-small --library c
+      bin/zig test ../std/index.zig --release-small --library c
+
+      bin/zig test ../test/behavior.zig --release-small
+      bin/zig test ../std/special/compiler_rt/index.zig --release-small
+      bin/zig test ../std/index.zig --release-small
+
+      bin/zig test ../test/behavior.zig --release-safe
+      bin/zig test ../std/special/compiler_rt/index.zig --release-safe
+      bin/zig test ../std/index.zig --release-safe
+
+      bin/zig test ../test/behavior.zig --release-safe --library c
+      bin/zig test ../std/special/compiler_rt/index.zig --release-safe --library c
+      bin/zig test ../std/index.zig --release-safe --library c
       # TODO enable all tests
       #bin/zig build --build-file ../build.zig test
       # TODO integrate with the download page updater and make a
diff --git a/test/tests.zig b/test/tests.zig
index 866955f707d002bfd646be18ee39f71f78fac3d2..1ca06b4b3452f73f173ea05c999ee130785c5e1b 100644
--- a/test/tests.zig
+++ b/test/tests.zig
@@ -38,11 +38,6 @@ const test_targets = []TestTarget{
         .arch = builtin.Arch.x86_64,
         .environ = builtin.Environ.unknown,
     },
-    TestTarget{
-        .os = builtin.Os.freebsd,
-        .arch = builtin.Arch.x86_64,
-        .environ = builtin.Environ.unknown,
-    },
     TestTarget{
         .os = builtin.Os.windows,
         .arch = builtin.Arch.x86_64,