diff --git a/tests/azure/nightly.yml b/tests/azure/nightly.yml
index 83bce8b5c8fffbc4cde8bfa1aca9731716372d48..7f0397285afcbdf8061f4833994dea13ccadfab2 100644
--- a/tests/azure/nightly.yml
+++ b/tests/azure/nightly.yml
@@ -34,6 +34,15 @@ stages:
       scenario: fedora-latest
       ansible_version: "-core >=2.11,<2.12"
 
+- stage: FedoraLatest_Ansible_Core_2_12
+  dependsOn: []
+  jobs:
+  - template: templates/group_tests.yml
+    parameters:
+      build_number: $(Build.BuildNumber)
+      scenario: fedora-latest
+      ansible_version: "-core >=2.12,<2.13"
+
 - stage: FedoraLatest_Ansible_latest
   dependsOn: []
   jobs:
@@ -63,6 +72,15 @@ stages:
       scenario: centos-8
       ansible_version: "-core >=2.11,<2.12"
 
+- stage: CentOS8_Ansible_Core_2_12
+  dependsOn: []
+  jobs:
+  - template: templates/group_tests.yml
+    parameters:
+      build_number: $(Build.BuildNumber)
+      scenario: centos-8
+      ansible_version: "-core >=2.12,<2.13"
+
 - stage: CentOS8_Ansible_latest
   dependsOn: []
   jobs:
@@ -92,6 +110,15 @@ stages:
       scenario: centos-7
       ansible_version: "-core >=2.11,<2.12"
 
+- stage: CentOS7_Ansible_Core_2_12
+  dependsOn: []
+  jobs:
+  - template: templates/group_tests.yml
+    parameters:
+      build_number: $(Build.BuildNumber)
+      scenario: centos-7
+      ansible_version: "-core >=2.12,<2.13"
+
 - stage: CentOS7_Ansible_latest
   dependsOn: []
   jobs:
diff --git a/tests/azure/templates/playbook_tests.yml b/tests/azure/templates/playbook_tests.yml
index d2955339947c6b00d162748e4409d06abdc544bb..299db69252d26e968dc953f9f52cde341a3e9712 100644
--- a/tests/azure/templates/playbook_tests.yml
+++ b/tests/azure/templates/playbook_tests.yml
@@ -14,7 +14,7 @@ parameters:
     default: ""
   - name: python_version
     type: string
-    default: 3.6
+    default: 3.x
   - name: build_number
     type: string
 
diff --git a/tests/azure/templates/pytest_tests.yml b/tests/azure/templates/pytest_tests.yml
index dc4958799bd16bca4cf05a4b7fe6220de8dd7374..3d8883c14a0812671d07f3acdab8d28fff478249 100644
--- a/tests/azure/templates/pytest_tests.yml
+++ b/tests/azure/templates/pytest_tests.yml
@@ -9,7 +9,7 @@ parameters:
     default: ""
   - name: python_version
     type: string
-    default: 3.6
+    default: 3.x
 
 jobs:
 - job: Test_PyTests