diff --git a/.travis.yml b/.travis.yml
index 6f069c7f46..62180e47fa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -86,9 +86,11 @@ matrix:
       os: osx
 
     # *BSD
-    - env: TARGET=i686-unknown-freebsd DISABLE_TESTS=1
-      rust: 1.13.0
-    # - env: TARGET=x86_64-unknown-freebsd DISABLE_TESTS=1 # Uses BuildBot instead
+    # FreeBSD i686 and x86_64 use BuildBot instead of Travis
+    # Note that i686-unknown-freebsd is actually using stable Rust instead of
+    # 1.13.0 because rustup does not support i686-unknown-freebsd
+    # - env: TARGET=i686-unknown-freebsd DISABLE_TESTS=1
+    # - env: TARGET=x86_64-unknown-freebsd DISABLE_TESTS=1
     - env: TARGET=x86_64-unknown-netbsd DISABLE_TESTS=1
       rust: 1.13.0
 
diff --git a/bors.toml b/bors.toml
index f0e827c9ce..3151bf821c 100644
--- a/bors.toml
+++ b/bors.toml
@@ -1,6 +1,7 @@
 # Gate on Travis CI and Buildbot
 status = ["continuous-integration/travis-ci/push",
-          "buildbot/nix-rust/nix amd64_fbsd11"]
+          "buildbot/nix-rust/nix amd64_fbsd11",
+          "buildbot/nix-rust/nix i386_fbsd11"]
 
 # Set bors's timeout to 4 hours
 #