diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index af74f224b6..6c96cecec3 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -109,19 +109,6 @@ stages:
             - test: 2
             - test: 3
             - test: 4
-  - stage: Sanity_2_16
-    displayName: Sanity 2.16
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Test {0}
-          testFormat: 2.16/sanity/{0}
-          targets:
-            - test: 1
-            - test: 2
-            - test: 3
-            - test: 4
 ### Units
   - stage: Units_2_20
     displayName: Units 2.20
@@ -174,18 +161,6 @@ stages:
             - test: 3.7
             - test: "3.10"
             - test: "3.12"
-  - stage: Units_2_16
-    displayName: Units 2.16
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Python {0}
-          testFormat: 2.16/units/{0}/1
-          targets:
-            - test: 2.7
-            - test: 3.6
-            - test: "3.11"
 
 ## Remote
   - stage: Remote_2_20_extra_vms
@@ -280,28 +255,6 @@ stages:
             - 1
             - 2
             - 3
-  - 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
-            - 3
 
 ### Docker
   - stage: Docker_2_20
@@ -376,26 +329,6 @@ stages:
             - 1
             - 2
             - 3
-  - 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
-            - name: CentOS 7
-              test: centos7
-          groups:
-            - 1
-            - 2
-            - 3
 
 ### Community Docker
   - stage: Docker_community_2_20
@@ -466,18 +399,6 @@ stages:
 #          targets:
 #            - test: '3.7'
 #            - test: '3.12'
-#  - stage: Generic_2_16
-#    displayName: Generic 2.16
-#    dependsOn: []
-#    jobs:
-#      - template: templates/matrix.yml
-#        parameters:
-#          nameFormat: Python {0}
-#          testFormat: 2.16/generic/{0}/1
-#          targets:
-#            - test: '2.7'
-#            - test: '3.6'
-#            - test: '3.11'
 
   - stage: Summary
     condition: succeededOrFailed()
@@ -486,29 +407,24 @@ stages:
       - Sanity_2_19
       - Sanity_2_18
       - Sanity_2_17
-      - Sanity_2_16
       - Units_2_20
       - Units_2_19
       - Units_2_18
       - Units_2_17
-      - Units_2_16
       - Remote_2_20_extra_vms
       - Remote_2_20
       - Remote_2_19
       - Remote_2_18
       - Remote_2_17
-      - Remote_2_16
       - Docker_2_20
       - Docker_2_19
       - Docker_2_18
       - Docker_2_17
-      - Docker_2_16
       - Docker_community_2_20
 # Right now all generic tests are disabled. Uncomment when at least one of them is re-enabled.
 #      - Generic_2_20
 #      - 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 fa8b119c37..572873c2f4 100644
--- a/.github/workflows/ansible-test.yml
+++ b/.github/workflows/ansible-test.yml
@@ -30,6 +30,7 @@ jobs:
       matrix:
         ansible:
           - '2.15'
+          - '2.16'
     # Ansible-test on various stable branches does not yet work well with cgroups v2.
     # Since ubuntu-latest now uses Ubuntu 22.04, we need to fall back to the ubuntu-20.04
     # image for these stable branches. The list of branches where this is necessary will
@@ -73,6 +74,12 @@ jobs:
             python: '3.5'
           - ansible: '2.15'
             python: '3.10'
+          - ansible: '2.16'
+            python: '2.7'
+          - ansible: '2.16'
+            python: '3.6'
+          - ansible: '2.16'
+            python: '3.11'
 
     steps:
       - name: >-
@@ -138,19 +145,43 @@ jobs:
             docker: fedora37
             python: ''
             target: azp/posix/3/
-          # Right now all generic tests are disabled. Uncomment when at least one of them is re-enabled.
-          # - ansible: '2.13'
-          #   docker: default
-          #   python: '3.9'
-          #   target: azp/generic/1/
-          # - ansible: '2.14'
-          #   docker: default
-          #   python: '3.10'
-          #   target: azp/generic/1/
-          # - ansible: '2.15'
-          #   docker: default
-          #   python: '3.9'
-          #   target: azp/generic/1/
+          # 2.16
+          - ansible: '2.16'
+            docker: alpine3
+            python: ''
+            target: azp/posix/1/
+          - ansible: '2.16'
+            docker: alpine3
+            python: ''
+            target: azp/posix/2/
+          - ansible: '2.16'
+            docker: alpine3
+            python: ''
+            target: azp/posix/3/
+          - ansible: '2.16'
+            docker: fedora38
+            python: ''
+            target: azp/posix/1/
+          - ansible: '2.16'
+            docker: fedora38
+            python: ''
+            target: azp/posix/2/
+          - ansible: '2.16'
+            docker: fedora38
+            python: ''
+            target: azp/posix/3/
+          - ansible: '2.16'
+            docker: opensuse15
+            python: ''
+            target: azp/posix/1/
+          - ansible: '2.16'
+            docker: opensuse15
+            python: ''
+            target: azp/posix/2/
+          - ansible: '2.16'
+            docker: opensuse15
+            python: ''
+            target: azp/posix/3/
 
     steps:
       - name: >-