diff --git a/tests/azure/templates/variables_c8s.yaml b/tests/azure/templates/variables_c8s.yaml
index 586d5ecb..8fdc2819 100644
--- a/tests/azure/templates/variables_c8s.yaml
+++ b/tests/azure/templates/variables_c8s.yaml
@@ -5,11 +5,13 @@
 #
 # Example:
 #
-# disabled_modules: >-
+# ipa_disabled_modules: >-
 #   dnsconfig,
 #   group,
 #   hostgroup
 #
+# If no variables are set, set "empty: true" as at least
+# one item is needed in the set.
 ---
 variables:
   empty: true
diff --git a/tests/azure/templates/variables_c9s.yaml b/tests/azure/templates/variables_c9s.yaml
index 586d5ecb..8fdc2819 100644
--- a/tests/azure/templates/variables_c9s.yaml
+++ b/tests/azure/templates/variables_c9s.yaml
@@ -5,11 +5,13 @@
 #
 # Example:
 #
-# disabled_modules: >-
+# ipa_disabled_modules: >-
 #   dnsconfig,
 #   group,
 #   hostgroup
 #
+# If no variables are set, set "empty: true" as at least
+# one item is needed in the set.
 ---
 variables:
   empty: true
diff --git a/tests/azure/templates/variables_centos-7.yaml b/tests/azure/templates/variables_centos-7.yaml
index 8628af2e..4d29c2de 100644
--- a/tests/azure/templates/variables_centos-7.yaml
+++ b/tests/azure/templates/variables_centos-7.yaml
@@ -5,11 +5,13 @@
 #
 # Example:
 #
-# disabled_modules: >-
+# ipa_disabled_modules: >-
 #   dnsconfig,
 #   group,
 #   hostgroup
 #
+# If no variables are set, set "empty: true" as at least
+# one item is needed in the set.
 ---
 variables:
   # ipa_enabled_modules: >-
diff --git a/tests/azure/templates/variables_fedora-latest.yaml b/tests/azure/templates/variables_fedora-latest.yaml
index 04fb6d29..59210e0d 100644
--- a/tests/azure/templates/variables_fedora-latest.yaml
+++ b/tests/azure/templates/variables_fedora-latest.yaml
@@ -1,20 +1,22 @@
 #
+#
 # 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: >-
+# ipa_disabled_modules: >-
 #   dnsconfig,
 #   group,
 #   hostgroup
 #
+# If no variables are set, set "empty: true" as at least
+# one item is needed in the set.
 ---
 variables:
+  empty: true
   # ipa_enabled_modules: >-
   # ipa_enabled_tests: >-
-  ipa_disabled_modules: >-
-    dnsforwardzone,
-  ipa_disabled_tests: >-
-    test_dnsconfig_forwarders_ports
+  # ipa_disabled_modules: >-
+  # ipa_disabled_tests: >-
diff --git a/tests/azure/templates/variables_fedora-rawhide.yaml b/tests/azure/templates/variables_fedora-rawhide.yaml
index d412651b..ba8cc602 100644
--- a/tests/azure/templates/variables_fedora-rawhide.yaml
+++ b/tests/azure/templates/variables_fedora-rawhide.yaml
@@ -5,17 +5,17 @@
 #
 # Example:
 #
-# disabled_modules: >-
+# ipa_disabled_modules: >-
 #   dnsconfig,
 #   group,
 #   hostgroup
 #
+# If no variables are set, set "empty: true" as at least
+# one item is needed in the set.
 ---
 variables:
   empty: true
   # ipa_enabled_modules: >-
   # ipa_enabled_tests: >-
-  ipa_disabled_modules: >-
-    dnsforwardzone,
-  ipa_disabled_tests: >-
-    test_dnsconfig_forwarders_ports
+  # ipa_disabled_modules: >-
+  # ipa_disabled_tests: >-