diff --git a/master/custom/builders.py b/master/custom/builders.py
index 71f42d8d7..64e6408c7 100644
--- a/master/custom/builders.py
+++ b/master/custom/builders.py
@@ -20,7 +20,6 @@
     ClangUnixInstalledBuild,
     SharedUnixBuild,
     SlowNonDebugUnixBuild,
-    SlowSharedUnixBuild,
     SlowUnixInstalledBuild,
     LTONonDebugUnixBuild,
     LTOPGONonDebugBuild,
@@ -199,6 +198,8 @@ def get_builders(settings):
         # Other Unix
         ("PPC64 AIX", "edelsohn-aix-ppc64", AIXBuild, UNSTABLE, NO_TIER),
         ("PPC64 AIX XLC", "edelsohn-aix-ppc64", AIXBuildWithXLC, UNSTABLE, NO_TIER),
+        # XXX: to be TIER_3 when stabilized
+        ("AMD64 FreeBSD", "ware-freebsd", UnixBuild, UNSTABLE, NO_TIER),
         ("SPARCv9 Oracle Solaris 11.4", "kulikjak-solaris-sparcv9", UnixBuild, UNSTABLE, NO_TIER),
 
         # Windows/arm64
diff --git a/master/custom/workers.py b/master/custom/workers.py
index cf1da6cac..ce11499fd 100644
--- a/master/custom/workers.py
+++ b/master/custom/workers.py
@@ -234,6 +234,11 @@ def get_workers(settings):
             tags=['linux', 'unix', 'alpine', 'docker', 'amd64', 'x86-64'],
             branches=['3.x'],
         ),
+        cpw(
+            name="ware-freebsd",
+            tags=['freebsd', 'bsd', 'unix', 'amd64', 'x86-64'],
+            parallel_tests=4,
+        ),
         cpw(
             name="ware-gentoo-x86",
             tags=['linux', 'unix', 'gentoo', 'x86'],