diff --git a/shippable.yml b/shippable.yml
index 9987e802fb4..5b7f14adf81 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -24,8 +24,8 @@ matrix:
     - env: T=network
 
     - env: T=osx/10.11/1
-    - env: T=freebsd/10.3-STABLE/1
-    - env: T=freebsd/11.0-STABLE/1
+    - env: T=freebsd/10.4/1
+    - env: T=freebsd/11.1/1
     - env: T=linux/centos6/1
     - env: T=linux/centos7/1
     - env: T=linux/fedora24/1
@@ -37,8 +37,8 @@ matrix:
     - env: T=linux/ubuntu1604py3/1
 
     - env: T=osx/10.11/2
-    - env: T=freebsd/10.3-STABLE/2
-    - env: T=freebsd/11.0-STABLE/2
+    - env: T=freebsd/10.4/2
+    - env: T=freebsd/11.1/2
     - env: T=linux/centos6/2
     - env: T=linux/centos7/2
     - env: T=linux/fedora24/2
@@ -50,8 +50,8 @@ matrix:
     - env: T=linux/ubuntu1604py3/2
 
     - env: T=osx/10.11/3
-    - env: T=freebsd/10.3-STABLE/3
-    - env: T=freebsd/11.0-STABLE/3
+    - env: T=freebsd/10.4/3
+    - env: T=freebsd/11.1/3
     - env: T=linux/centos6/3
     - env: T=linux/centos7/3
     - env: T=linux/fedora24/3