diff --git a/shippable.yml b/shippable.yml
index d24b2bd9a35..8a43d047bf7 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -83,7 +83,7 @@ matrix:
     - env: T=rhel/7.6/1
     - env: T=rhel/8.1/1
     - env: T=freebsd/11.1/1
-    - env: T=freebsd/12.0/1
+    - env: T=freebsd/12.1/1
     - env: T=linux/centos6/1
     - env: T=linux/centos7/1
     - env: T=linux/centos8/1
@@ -99,7 +99,7 @@ matrix:
     - env: T=rhel/7.6/2
     - env: T=rhel/8.1/2
     - env: T=freebsd/11.1/2
-    - env: T=freebsd/12.0/2
+    - env: T=freebsd/12.1/2
     - env: T=linux/centos6/2
     - env: T=linux/centos7/2
     - env: T=linux/centos8/2
@@ -115,7 +115,7 @@ matrix:
     - env: T=rhel/7.6/3
     - env: T=rhel/8.1/3
     - env: T=freebsd/11.1/3
-    - env: T=freebsd/12.0/3
+    - env: T=freebsd/12.1/3
     - env: T=linux/centos6/3
     - env: T=linux/centos7/3
     - env: T=linux/centos8/3
@@ -131,7 +131,7 @@ matrix:
     - env: T=rhel/7.6/4
     - env: T=rhel/8.1/4
     - env: T=freebsd/11.1/4
-    - env: T=freebsd/12.0/4
+    - env: T=freebsd/12.1/4
     - env: T=linux/centos6/4
     - env: T=linux/centos7/4
     - env: T=linux/centos8/4
@@ -147,7 +147,7 @@ matrix:
     - env: T=rhel/7.6/5
     - env: T=rhel/8.1/5
     - env: T=freebsd/11.1/5
-    - env: T=freebsd/12.0/5
+    - env: T=freebsd/12.1/5
     - env: T=linux/centos6/5
     - env: T=linux/centos7/5
     - env: T=linux/centos8/5
diff --git a/test/lib/ansible_test/_data/completion/remote.txt b/test/lib/ansible_test/_data/completion/remote.txt
index 603e6814710..884d9d8eccd 100644
--- a/test/lib/ansible_test/_data/completion/remote.txt
+++ b/test/lib/ansible_test/_data/completion/remote.txt
@@ -1,5 +1,5 @@
 freebsd/11.1 python=2.7,3.6 python_dir=/usr/local/bin
-freebsd/12.0 python=3.6,2.7 python_dir=/usr/local/bin
+freebsd/12.1 python=3.6,2.7 python_dir=/usr/local/bin
 osx/10.11 python=2.7 python_dir=/usr/local/bin
 rhel/7.6 python=2.7
 rhel/8.1 python=3.6