diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index 859ae601..f561c1df 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -183,10 +183,10 @@ stages:
               test: rhel/7.8
             - name: RHEL 8.2
               test: rhel/8.2
-            - name: FreeBSD 11.1
-              test: freebsd/11.1
-            - name: FreeBSD 12.1
-              test: freebsd/12.1
+            - name: FreeBSD 11.4
+              test: freebsd/11.4
+            - name: FreeBSD 12.2
+              test: freebsd/12.2
   - stage: Remote_2_10
     displayName: Remote 2.10
     dependsOn: []
@@ -197,6 +197,8 @@ stages:
           targets:
             - name: RHEL 7.8
               test: rhel/7.8
+            - name: FreeBSD 12.1
+              test: freebsd/12.1
   - stage: Remote_2_9
     displayName: Remote 2.9
     dependsOn: []
diff --git a/tests/integration/targets/setup_openssl/vars/FreeBSD.yml b/tests/integration/targets/setup_openssl/vars/FreeBSD.yml
index ee876235..4040bda4 100644
--- a/tests/integration/targets/setup_openssl/vars/FreeBSD.yml
+++ b/tests/integration/targets/setup_openssl/vars/FreeBSD.yml
@@ -1,4 +1,4 @@
 ---
 openssl_package_name: openssl
 cryptography_package_name: py27-cryptography
-cryptography_package_name_python3: py36-cryptography
+cryptography_package_name_python3: "py{{ ansible_python.version.major }}{{ ansible_python.version.minor }}-cryptography"
diff --git a/tests/integration/targets/setup_pyopenssl/vars/FreeBSD.yml b/tests/integration/targets/setup_pyopenssl/vars/FreeBSD.yml
index 4df752c1..7deca97a 100644
--- a/tests/integration/targets/setup_pyopenssl/vars/FreeBSD.yml
+++ b/tests/integration/targets/setup_pyopenssl/vars/FreeBSD.yml
@@ -1,3 +1,3 @@
 ---
 pyopenssl_package_name: py27-openssl
-pyopenssl_package_name_python3: py36-openssl
+pyopenssl_package_name_python3: "py{{ ansible_python.version.major }}{{ ansible_python.version.minor }}-openssl"