diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index bf187d57..33f6f6f6 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -83,17 +83,6 @@ stages:
               test: '2.17/sanity/1'
             - name: Units
               test: '2.17/units/1'
-  - stage: Ansible_2_16
-    displayName: Sanity & Units 2.16
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          targets:
-            - name: Sanity
-              test: '2.16/sanity/1'
-            - name: Units
-              test: '2.16/units/1'
 ### Docker
   - stage: Docker_2_19
     displayName: Docker 2.19
@@ -146,23 +135,6 @@ stages:
           groups:
             - 1
             - 2
-  - stage: Docker_2_16
-    displayName: Docker 2.16
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.16/linux/{0}
-          targets:
-            - name: Fedora 38
-              test: fedora38
-            - name: openSUSE 15
-              test: opensuse15
-            - name: Alpine 3
-              test: alpine3
-          groups:
-            - 1
-            - 2
 
 ### Community Docker
   - stage: Docker_community_2_19
@@ -255,27 +227,6 @@ stages:
           groups:
             - 1
             - 2
-  - stage: Remote_2_16
-    displayName: Remote 2.16
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.16/{0}
-          targets:
-            - name: macOS 13.2
-              test: macos/13.2
-            - name: RHEL 9.2
-              test: rhel/9.2
-            - name: RHEL 8.8
-              test: rhel/8.8
-            - name: RHEL 7.9
-              test: rhel/7.9
-            # - name: FreeBSD 13.2
-            #   test: freebsd/13.2
-          groups:
-            - 1
-            - 2
 ### Generic
   - stage: Generic_2_19
     displayName: Generic 2.19
@@ -322,21 +273,6 @@ stages:
           groups:
             - 1
             - 2
-  - stage: Generic_2_16
-    displayName: Generic 2.16
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Python {0}
-          testFormat: 2.16/generic/{0}
-          targets:
-            - test: "2.7"
-            - test: "3.6"
-            - test: "3.11"
-          groups:
-            - 1
-            - 2
 
   ## Finally
 
@@ -346,20 +282,16 @@ stages:
       - Ansible_2_19
       - Ansible_2_18
       - Ansible_2_17
-      - Ansible_2_16
       - Remote_2_19_extra_vms
       - Remote_2_19
       - Remote_2_18
       - Remote_2_17
-      - Remote_2_16
       - Docker_2_19
       - Docker_2_18
       - Docker_2_17
-      - Docker_2_16
       - Docker_community_2_19
       - Generic_2_19
       - Generic_2_18
       - Generic_2_17
-      - Generic_2_16
     jobs:
       - template: templates/coverage.yml
diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml
index abff749e..ef6e058c 100644
--- a/.github/workflows/ansible-test.yml
+++ b/.github/workflows/ansible-test.yml
@@ -36,6 +36,7 @@ jobs:
           - '2.13'
           - '2.14'
           - '2.15'
+          - '2.16'
     runs-on: ubuntu-latest
     steps:
       - name: Perform sanity testing
@@ -65,6 +66,7 @@ jobs:
           - '2.13'
           - '2.14'
           - '2.15'
+          - '2.16'
 
     steps:
       - name: >-
@@ -265,6 +267,55 @@ jobs:
             docker: default
             python: '3.10'
             target: azp/generic/2/
+          # 2.16
+          - ansible: '2.16'
+            docker: fedora38
+            python: ''
+            target: azp/posix/1/
+          - ansible: '2.16'
+            docker: fedora38
+            python: ''
+            target: azp/posix/2/
+          - ansible: '2.16'
+            docker: opensuse15
+            python: ''
+            target: azp/posix/1/
+          - ansible: '2.16'
+            docker: opensuse15
+            python: ''
+            target: azp/posix/2/
+          - ansible: '2.16'
+            docker: alpine3
+            python: ''
+            target: azp/posix/1/
+          - ansible: '2.16'
+            docker: alpine3
+            python: ''
+            target: azp/posix/2/
+          - ansible: '2.16'
+            docker: default
+            python: '2.7'
+            target: azp/generic/1/
+          - ansible: '2.16'
+            docker: default
+            python: '2.7'
+            target: azp/generic/2/
+          - ansible: '2.16'
+            docker: default
+            python: '3.6'
+            target: azp/generic/1/
+          - ansible: '2.16'
+            docker: default
+            python: '3.6'
+            target: azp/generic/2/
+          - ansible: '2.16'
+            docker: default
+            python: '3.11'
+            target: azp/generic/1/
+          - ansible: '2.16'
+            docker: default
+            python: '3.11'
+            target: azp/generic/2/
 
     steps:
       - name: >-