diff --git a/tests/azure/templates/galaxy_script.yml b/tests/azure/templates/galaxy_script.yml
index b669481891432e0cf9722d763f5a5ba53e017ac8..bf14238c8593c27a9d7235f7b2cc2bc994a08e41 100644
--- a/tests/azure/templates/galaxy_script.yml
+++ b/tests/azure/templates/galaxy_script.yml
@@ -25,6 +25,7 @@ jobs:
   timeoutInMinutes: 120
   variables:
   - template: variables.yaml
+  - template: variables_${{ parameters.scenario }}.yaml
   steps:
   - task: UsePythonVersion@0
     inputs:
diff --git a/tests/azure/templates/playbook_tests.yml b/tests/azure/templates/playbook_tests.yml
index 3fb15ad3a3d04667bed36864c846713f81bc11b2..abbdf8c0f9e41c674427029679d7536e573ed917 100644
--- a/tests/azure/templates/playbook_tests.yml
+++ b/tests/azure/templates/playbook_tests.yml
@@ -24,6 +24,7 @@ jobs:
   timeoutInMinutes: 120
   variables:
   - template: variables.yaml
+  - template: variables_${{ parameters.scenario }}.yaml
   steps:
   - task: UsePythonVersion@0
     inputs:
diff --git a/tests/azure/templates/pytest_tests.yml b/tests/azure/templates/pytest_tests.yml
index f25ce2a7dcae80c90e72d7318d0c6725a1570d37..6afd58905a526d7a4d911602d8c030423410eac9 100644
--- a/tests/azure/templates/pytest_tests.yml
+++ b/tests/azure/templates/pytest_tests.yml
@@ -18,6 +18,7 @@ jobs:
   timeoutInMinutes: 120
   variables:
   - template: variables.yaml
+  - template: variables_${{ parameters.scenario }}.yaml
   steps:
   - task: UsePythonVersion@0
     inputs:
diff --git a/tests/azure/templates/variables.yaml b/tests/azure/templates/variables.yaml
index b6e1686806c728654b5e2ff21a7d5e58f0e6f127..3cdadc03ed8ada14f3ff4601542c4acaa965d890 100644
--- a/tests/azure/templates/variables.yaml
+++ b/tests/azure/templates/variables.yaml
@@ -3,6 +3,9 @@
 # For easier management of items to enable/disable,
 # use one test/module on each line, followed by a comma.
 #
+# If no variable is to be set, add 'empty: true', as the
+# 'variables' dict cannot be empty.
+#
 # Example:
 #
 # disabled_modules: >-
@@ -12,9 +15,8 @@
 #
 ---
 variables:
+  empty: true
   # ipa_enabled_modules: >-
   # ipa_enabled_tests: >-
-  ipa_disabled_modules: >-
-    dnsconfig,
-  ipa_disabled_tests: >-
-    test_dnsconfig_forwarders_ports
+  # ipa_disabled_modules: >-
+  # ipa_disabled_tests: >-
diff --git a/tests/azure/templates/variables_c8s.yaml b/tests/azure/templates/variables_c8s.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..586d5ecb2404924285a9f19ed2082bcf35be0a38
--- /dev/null
+++ b/tests/azure/templates/variables_c8s.yaml
@@ -0,0 +1,19 @@
+#
+# Variables must be defined as comma separated lists.
+# For easier management of items to enable/disable,
+# use one test/module on each line, followed by a comma.
+#
+# Example:
+#
+# disabled_modules: >-
+#   dnsconfig,
+#   group,
+#   hostgroup
+#
+---
+variables:
+  empty: true
+#   ipa_enabled_modules: >-
+#   ipa_enabled_tests: >-
+#   ipa_disabled_modules: >-
+#   ipa_disabled_tests: >-
diff --git a/tests/azure/templates/variables_c9s.yaml b/tests/azure/templates/variables_c9s.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..586d5ecb2404924285a9f19ed2082bcf35be0a38
--- /dev/null
+++ b/tests/azure/templates/variables_c9s.yaml
@@ -0,0 +1,19 @@
+#
+# Variables must be defined as comma separated lists.
+# For easier management of items to enable/disable,
+# use one test/module on each line, followed by a comma.
+#
+# Example:
+#
+# disabled_modules: >-
+#   dnsconfig,
+#   group,
+#   hostgroup
+#
+---
+variables:
+  empty: true
+#   ipa_enabled_modules: >-
+#   ipa_enabled_tests: >-
+#   ipa_disabled_modules: >-
+#   ipa_disabled_tests: >-
diff --git a/tests/azure/templates/variables_centos-7.yaml b/tests/azure/templates/variables_centos-7.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..586d5ecb2404924285a9f19ed2082bcf35be0a38
--- /dev/null
+++ b/tests/azure/templates/variables_centos-7.yaml
@@ -0,0 +1,19 @@
+#
+# Variables must be defined as comma separated lists.
+# For easier management of items to enable/disable,
+# use one test/module on each line, followed by a comma.
+#
+# Example:
+#
+# disabled_modules: >-
+#   dnsconfig,
+#   group,
+#   hostgroup
+#
+---
+variables:
+  empty: true
+#   ipa_enabled_modules: >-
+#   ipa_enabled_tests: >-
+#   ipa_disabled_modules: >-
+#   ipa_disabled_tests: >-
diff --git a/tests/azure/templates/variables_fedora-latest.yaml b/tests/azure/templates/variables_fedora-latest.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..04fb6d291c24b356eca5c376e08dff27f934883a
--- /dev/null
+++ b/tests/azure/templates/variables_fedora-latest.yaml
@@ -0,0 +1,20 @@
+#
+# Variables must be defined as comma separated lists.
+# For easier management of items to enable/disable,
+# use one test/module on each line, followed by a comma.
+#
+# Example:
+#
+# disabled_modules: >-
+#   dnsconfig,
+#   group,
+#   hostgroup
+#
+---
+variables:
+  # ipa_enabled_modules: >-
+  # ipa_enabled_tests: >-
+  ipa_disabled_modules: >-
+    dnsforwardzone,
+  ipa_disabled_tests: >-
+    test_dnsconfig_forwarders_ports
diff --git a/tests/azure/templates/variables_fedora-rawhide.yaml b/tests/azure/templates/variables_fedora-rawhide.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d828bccb91772bf0e4083000a6e61d76e7971b65
--- /dev/null
+++ b/tests/azure/templates/variables_fedora-rawhide.yaml
@@ -0,0 +1,19 @@
+#
+# Variables must be defined as comma separated lists.
+# For easier management of items to enable/disable,
+# use one test/module on each line, followed by a comma.
+#
+# Example:
+#
+# disabled_modules: >-
+#   dnsconfig,
+#   group,
+#   hostgroup
+#
+---
+variables:
+  empty: true
+  # ipa_enabled_modules: >-
+  # ipa_enabled_tests: >-
+  # ipa_disabled_modules: >-
+  # ipa_disabled_tests: >-