diff --git a/shippable.yml b/shippable.yml
index 75ba5e85785..275d0099991 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -53,6 +53,7 @@ matrix:
     - env: T=rhel/7.6/1
     - env: T=rhel/8.0/1
     - env: T=freebsd/11.1/1
+    - env: T=freebsd/12.0/1
     - env: T=linux/centos6/1
     - env: T=linux/centos7/1
     - env: T=linux/fedora28/1
@@ -67,6 +68,7 @@ matrix:
     - env: T=rhel/7.6/2
     - env: T=rhel/8.0/2
     - env: T=freebsd/11.1/2
+    - env: T=freebsd/12.0/2
     - env: T=linux/centos6/2
     - env: T=linux/centos7/2
     - env: T=linux/fedora28/2
@@ -81,6 +83,7 @@ matrix:
     - env: T=rhel/7.6/3
     - env: T=rhel/8.0/3
     - env: T=freebsd/11.1/3
+    - env: T=freebsd/12.0/3
     - env: T=linux/centos6/3
     - env: T=linux/centos7/3
     - env: T=linux/fedora28/3
diff --git a/test/runner/completion/remote.txt b/test/runner/completion/remote.txt
index 79deb0c045e..15f6431fc22 100644
--- a/test/runner/completion/remote.txt
+++ b/test/runner/completion/remote.txt
@@ -1,4 +1,5 @@
 freebsd/11.1
+freebsd/12.0
 osx/10.11
 rhel/7.6
 rhel/8.0