diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml
index f162d2a5..d293732e 100644
--- a/.zuul.d/jobs.yaml
+++ b/.zuul.d/jobs.yaml
@@ -58,7 +58,7 @@
     parent: ara-api-database-backends
     nodeset: ara-database-server-multinode
     description: |
-      Deploys the ARA API server on Ubuntu 18.04, Fedora 30 as well as CentOS 8
+      Deploys the ARA API server on Ubuntu 18.04, Fedora 31 as well as CentOS 8
       and tests it against a central PostgreSQL server installed on CentOS 8.
       The job exercises the ara_api Ansible role, the ARA Ansible plugins, the
       ARA API clients as well as the API itself.
@@ -70,7 +70,7 @@
     parent: ara-api-database-backends
     nodeset: ara-database-server-multinode
     description: |
-      Deploys the ARA API server on Ubuntu 18.04, Fedora 30 as well as CentOS 8
+      Deploys the ARA API server on Ubuntu 18.04, Fedora 31 as well as CentOS 8
       and tests it against a central MySQL server installed on CentOS 8.
       The job exercises the ara_api Ansible role, the ARA Ansible plugins, the
       ARA API clients as well as the API itself.
@@ -82,7 +82,7 @@
     parent: ara-api-database-backends
     nodeset: ara-multinode
     description: |
-      Deploys the ARA API server on Ubuntu 18.04, Fedora 30 as well as CentOS 8
+      Deploys the ARA API server on Ubuntu 18.04, Fedora 31 as well as CentOS 8
       and tests it using the distributed sqlite database backend.
     run: tests/with_distributed_sqlite.yaml
 
@@ -91,16 +91,16 @@
 - job:
     name: ara-api-fedora-packages
     parent: ara-integration-base
-    nodeset: ara-fedora-30
+    nodeset: ara-fedora-31
     description: |
-      Deploys the ARA API server on Fedora 30 using distribution packages for
+      Deploys the ARA API server on Fedora 31 using distribution packages for
       ARA and Ansible.
     run: tests/with_fedora_packages.yaml
 
 - job:
     name: ara-ansible-integration-base
     parent: ara-integration-base
-    nodeset: ara-fedora-30
+    nodeset: ara-fedora-31
     vars:
       ara_api_source: "{{ ansible_user_dir }}/src/opendev.org/recordsansible/ara"
     run: tests/basic.yaml
@@ -126,6 +126,9 @@
 - job:
     name: ara-basic-ansible-2.7
     parent: ara-ansible-integration-base
+    vars:
+      # Not required for 2.8 and above
+      ansible_python_interpreter: /usr/bin/python3
     description: |
       Runs basic integration tests through the equivalent of "tox -e ansible-integration" with Ansible 2.7.
     required-projects:
diff --git a/.zuul.d/nodesets.yaml b/.zuul.d/nodesets.yaml
index c4d0d73c..cd320335 100644
--- a/.zuul.d/nodesets.yaml
+++ b/.zuul.d/nodesets.yaml
@@ -7,8 +7,8 @@
         label: centos-8
       - name: ubuntu-bionic
         label: ubuntu-bionic
-      - name: fedora-30
-        label: fedora-30
+      - name: fedora-31
+        label: fedora-31
       - name: centos-8
         label: centos-8
     groups:
@@ -18,7 +18,7 @@
       - name: ara-api-server
         nodes:
           - ubuntu-bionic
-          - fedora-30
+          - fedora-31
           - centos-8
 
 # Nodeset used to test instances of ARA API deployed on different operating
@@ -28,23 +28,23 @@
     nodes:
       - name: ubuntu-bionic
         label: ubuntu-bionic
-      - name: fedora-30
-        label: fedora-30
+      - name: fedora-31
+        label: fedora-31
       - name: centos-8
         label: centos-8
     groups:
       - name: ara-api-server
         nodes:
           - ubuntu-bionic
-          - fedora-30
+          - fedora-31
           - centos-8
 
 - nodeset:
-    name: ara-fedora-30
+    name: ara-fedora-31
     nodes:
-      - name: fedora-30
-        label: fedora-30
+      - name: fedora-31
+        label: fedora-31
     groups:
       - name: ara-api-server
         nodes:
-          - fedora-30
+          - fedora-31
diff --git a/tests/integration/hosts.yaml b/tests/integration/hosts.yaml
index 496e77e7..a2f00c51 100644
--- a/tests/integration/hosts.yaml
+++ b/tests/integration/hosts.yaml
@@ -25,6 +25,8 @@
         name: "{{ item }}"
         ansible_host: "127.0.0.1"
         ansible_connection: "local"
+        # Not required for 2.8 and above
+        ansible_python_interpreter: /usr/bin/python3
       with_items:
         - host1
         - host2
diff --git a/tests/integration/smoke.yaml b/tests/integration/smoke.yaml
index 23017337..461f27b3 100644
--- a/tests/integration/smoke.yaml
+++ b/tests/integration/smoke.yaml
@@ -46,6 +46,8 @@
         name: "höstñämë"
         ansible_host: "127.0.0.1"
         ansible_connection: "local"
+        # Not required for 2.8 and above
+        ansible_python_interpreter: /usr/bin/python3
       tags:
         - untag
         - verytag