diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index d045b0e0c2..6c3289dfd7 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -168,10 +168,10 @@ stages:
         parameters:
           testFormat: devel/{0}
           targets:
-            - name: Alpine 3.21
-              test: alpine/3.21
-            # - name: Fedora 41
-            #   test: fedora/41
+            - name: Alpine 3.22
+              test: alpine/3.22
+            # - name: Fedora 42
+            #   test: fedora/42
             - name: Ubuntu 22.04
               test: ubuntu/22.04
             - name: Ubuntu 24.04
@@ -190,10 +190,10 @@ stages:
               test: macos/15.3
             - name: RHEL 10.0
               test: rhel/10.0
-            - name: RHEL 9.5
-              test: rhel/9.5
-            - name: FreeBSD 14.2
-              test: freebsd/14.2
+            - name: RHEL 9.6
+              test: rhel/9.6
+            - name: FreeBSD 14.3
+              test: freebsd/14.3
             - name: FreeBSD 13.5
               test: freebsd/13.5
           groups:
@@ -208,8 +208,12 @@ stages:
         parameters:
           testFormat: 2.19/{0}
           targets:
+            - name: RHEL 9.5
+              test: rhel/9.5
             - name: RHEL 10.0
               test: rhel/10.0
+            - name: FreeBSD 14.2
+              test: freebsd/14.2
           groups:
             - 1
             - 2
@@ -258,10 +262,10 @@ stages:
         parameters:
           testFormat: devel/linux/{0}
           targets:
-            - name: Fedora 41
-              test: fedora41
-            - name: Alpine 3.21
-              test: alpine321
+            - name: Fedora 42
+              test: fedora42
+            - name: Alpine 3.22
+              test: alpine322
             - name: Ubuntu 22.04
               test: ubuntu2204
             - name: Ubuntu 24.04
@@ -278,8 +282,10 @@ stages:
         parameters:
           testFormat: 2.19/linux/{0}
           targets:
-            - name: Ubuntu 24.04
-              test: ubuntu2404
+            - name: Fedora 41
+              test: fedora41
+            - name: Alpine 3.21
+              test: alpine321
           groups:
             - 1
             - 2
diff --git a/tests/integration/targets/android_sdk/tasks/setup.yml b/tests/integration/targets/android_sdk/tasks/setup.yml
index 8ded283533..9965403367 100644
--- a/tests/integration/targets/android_sdk/tasks/setup.yml
+++ b/tests/integration/targets/android_sdk/tasks/setup.yml
@@ -15,6 +15,7 @@
       files:
         - '{{ ansible_distribution }}-{{ ansible_distribution_version }}.yml'
         - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml'
+        - '{{ ansible_distribution }}.yml'
         - '{{ ansible_os_family }}.yml'
       paths:
         - '{{ role_path }}/vars'
diff --git a/tests/integration/targets/android_sdk/vars/Fedora.yml b/tests/integration/targets/android_sdk/vars/Fedora.yml
new file mode 100644
index 0000000000..e48443f0b5
--- /dev/null
+++ b/tests/integration/targets/android_sdk/vars/Fedora.yml
@@ -0,0 +1,6 @@
+---
+# Copyright (c) Ansible Project
+# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+openjdk_pkg: java-21-openjdk-headless
diff --git a/tests/integration/targets/android_sdk/vars/RedHat-9.yml b/tests/integration/targets/android_sdk/vars/RedHat-9.yml
new file mode 100644
index 0000000000..e48443f0b5
--- /dev/null
+++ b/tests/integration/targets/android_sdk/vars/RedHat-9.yml
@@ -0,0 +1,6 @@
+---
+# Copyright (c) Ansible Project
+# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+openjdk_pkg: java-21-openjdk-headless
diff --git a/tests/integration/targets/django_command/aliases b/tests/integration/targets/django_command/aliases
index a742f24fea..c14251f85e 100644
--- a/tests/integration/targets/django_command/aliases
+++ b/tests/integration/targets/django_command/aliases
@@ -20,4 +20,5 @@ skip/rhel9.2
 skip/rhel9.3
 skip/rhel9.4
 skip/rhel9.5
+skip/rhel9.6
 skip/rhel10.0
diff --git a/tests/integration/targets/django_manage/aliases b/tests/integration/targets/django_manage/aliases
index a742f24fea..c14251f85e 100644
--- a/tests/integration/targets/django_manage/aliases
+++ b/tests/integration/targets/django_manage/aliases
@@ -20,4 +20,5 @@ skip/rhel9.2
 skip/rhel9.3
 skip/rhel9.4
 skip/rhel9.5
+skip/rhel9.6
 skip/rhel10.0
diff --git a/tests/integration/targets/filter_jc/aliases b/tests/integration/targets/filter_jc/aliases
index 62fbc2daba..978a58095d 100644
--- a/tests/integration/targets/filter_jc/aliases
+++ b/tests/integration/targets/filter_jc/aliases
@@ -8,3 +8,4 @@ skip/freebsd13.3  # FIXME - ruyaml compilation fails
 skip/freebsd14.0  # FIXME - ruyaml compilation fails
 skip/freebsd14.1  # FIXME - ruyaml compilation fails
 skip/freebsd14.2  # FIXME - ruyaml compilation fails
+skip/freebsd14.3  # FIXME - ruyaml compilation fails
diff --git a/tests/integration/targets/homectl/aliases b/tests/integration/targets/homectl/aliases
index 3e4ed8c114..3621858566 100644
--- a/tests/integration/targets/homectl/aliases
+++ b/tests/integration/targets/homectl/aliases
@@ -13,4 +13,5 @@ skip/rhel9.2  # See https://www.reddit.com/r/Fedora/comments/si7nzk/homectl/
 skip/rhel9.3  # See https://www.reddit.com/r/Fedora/comments/si7nzk/homectl/
 skip/rhel9.4  # See https://www.reddit.com/r/Fedora/comments/si7nzk/homectl/
 skip/rhel9.5  # See https://www.reddit.com/r/Fedora/comments/si7nzk/homectl/
+skip/rhel9.6  # See https://www.reddit.com/r/Fedora/comments/si7nzk/homectl/
 skip/rhel10.0  # See https://www.reddit.com/r/Fedora/comments/si7nzk/homectl/
diff --git a/tests/integration/targets/iso_extract/aliases b/tests/integration/targets/iso_extract/aliases
index 2c58f9253e..00569608e0 100644
--- a/tests/integration/targets/iso_extract/aliases
+++ b/tests/integration/targets/iso_extract/aliases
@@ -13,6 +13,7 @@ skip/rhel9.2  # FIXME
 skip/rhel9.3  # FIXME
 skip/rhel9.4  # FIXME
 skip/rhel9.5  # FIXME
+skip/rhel9.6  # FIXME
 skip/rhel10.0  # FIXME
 skip/freebsd12.4  # FIXME
 skip/freebsd13.2  # FIXME
@@ -22,3 +23,4 @@ skip/freebsd13.5  # FIXME
 skip/freebsd14.0  # FIXME
 skip/freebsd14.1  # FIXME
 skip/freebsd14.2  # FIXME
+skip/freebsd14.3  # FIXME
diff --git a/tests/integration/targets/lvg/aliases b/tests/integration/targets/lvg/aliases
index cbe489d88b..eb76529397 100644
--- a/tests/integration/targets/lvg/aliases
+++ b/tests/integration/targets/lvg/aliases
@@ -11,3 +11,4 @@ skip/freebsd
 skip/osx
 skip/macos
 skip/alpine3.21 # TODO try to fix
+skip/alpine3.22 # TODO try to fix
diff --git a/tests/integration/targets/odbc/aliases b/tests/integration/targets/odbc/aliases
index 3802d30f87..ee15fde5bb 100644
--- a/tests/integration/targets/odbc/aliases
+++ b/tests/integration/targets/odbc/aliases
@@ -13,5 +13,6 @@ skip/rhel9.2
 skip/rhel9.3
 skip/rhel9.4
 skip/rhel9.5
+skip/rhel9.6
 skip/rhel10.0
 skip/freebsd
diff --git a/tests/integration/targets/pkgng/tasks/freebsd.yml b/tests/integration/targets/pkgng/tasks/freebsd.yml
index 2dcd7b02a8..b51ad836bd 100644
--- a/tests/integration/targets/pkgng/tasks/freebsd.yml
+++ b/tests/integration/targets/pkgng/tasks/freebsd.yml
@@ -534,12 +534,14 @@
   #
   # NOTE: FreeBSD 14.2 fails as well (someone with FreeBSD knowledge has to take a look)
   #
+  # NOTE: FreeBSD 14.3 fails as well (someone with FreeBSD knowledge has to take a look)
+  #
   # See also
   # https://github.com/ansible-collections/community.general/issues/5795
   when: >-
     (ansible_distribution_version is version('12.01', '>=') and ansible_distribution_version is version('12.3', '<'))
     or (ansible_distribution_version is version('13.6', '>=') and ansible_distribution_version is version('14.0', '<'))
-    or ansible_distribution_version is version('14.3', '>=')
+    or ansible_distribution_version is version('14.4', '>=')
   block:
     - name: Setup testjail
       include_tasks: setup-testjail.yml
diff --git a/tests/integration/targets/setup_java_keytool/tasks/main.yml b/tests/integration/targets/setup_java_keytool/tasks/main.yml
index 9f156425d8..56ba7a9581 100644
--- a/tests/integration/targets/setup_java_keytool/tasks/main.yml
+++ b/tests/integration/targets/setup_java_keytool/tasks/main.yml
@@ -22,6 +22,7 @@
       files:
         - '{{ ansible_distribution }}-{{ ansible_distribution_version }}.yml'
         - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml'
+        - '{{ ansible_distribution }}.yml'
         - '{{ ansible_os_family }}.yml'
       paths:
         - '{{ role_path }}/vars'
diff --git a/tests/integration/targets/setup_java_keytool/vars/Fedora.yml b/tests/integration/targets/setup_java_keytool/vars/Fedora.yml
new file mode 100644
index 0000000000..5f77ea9bba
--- /dev/null
+++ b/tests/integration/targets/setup_java_keytool/vars/Fedora.yml
@@ -0,0 +1,7 @@
+---
+# Copyright (c) Ansible Project
+# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+keytool_package_names:
+  - java-21-openjdk-headless
diff --git a/tests/integration/targets/setup_snap/tasks/D-RedHat-9.3.yml b/tests/integration/targets/setup_snap/tasks/D-RedHat-9.3.yml
deleted file mode 100644
index 5bbfaff128..0000000000
--- a/tests/integration/targets/setup_snap/tasks/D-RedHat-9.3.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-# Copyright (c) Ansible Project
-# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# Do nothing
diff --git a/tests/integration/targets/setup_snap/tasks/D-RedHat-9.3.yml b/tests/integration/targets/setup_snap/tasks/D-RedHat-9.3.yml
new file mode 120000
index 0000000000..0b06951496
--- /dev/null
+++ b/tests/integration/targets/setup_snap/tasks/D-RedHat-9.3.yml
@@ -0,0 +1 @@
+nothing.yml
\ No newline at end of file
diff --git a/tests/integration/targets/setup_snap/tasks/D-RedHat-9.5.yml b/tests/integration/targets/setup_snap/tasks/D-RedHat-9.5.yml
deleted file mode 100644
index 5bbfaff128..0000000000
--- a/tests/integration/targets/setup_snap/tasks/D-RedHat-9.5.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-# Copyright (c) Ansible Project
-# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# Do nothing
diff --git a/tests/integration/targets/setup_snap/tasks/D-RedHat-9.5.yml b/tests/integration/targets/setup_snap/tasks/D-RedHat-9.5.yml
new file mode 120000
index 0000000000..0b06951496
--- /dev/null
+++ b/tests/integration/targets/setup_snap/tasks/D-RedHat-9.5.yml
@@ -0,0 +1 @@
+nothing.yml
\ No newline at end of file
diff --git a/tests/integration/targets/setup_snap/tasks/D-RedHat-9.6.yml b/tests/integration/targets/setup_snap/tasks/D-RedHat-9.6.yml
new file mode 120000
index 0000000000..0b06951496
--- /dev/null
+++ b/tests/integration/targets/setup_snap/tasks/D-RedHat-9.6.yml
@@ -0,0 +1 @@
+nothing.yml
\ No newline at end of file
diff --git a/tests/integration/targets/ufw/aliases b/tests/integration/targets/ufw/aliases
index 0d89cc8fea..07227edc3f 100644
--- a/tests/integration/targets/ufw/aliases
+++ b/tests/integration/targets/ufw/aliases
@@ -15,6 +15,7 @@ skip/rhel9.2  # FIXME
 skip/rhel9.3  # FIXME
 skip/rhel9.4  # FIXME
 skip/rhel9.5  # FIXME
+skip/rhel9.6  # FIXME
 skip/rhel10.0  # FIXME
 skip/docker
 needs/root