diff --git a/.zuul.yaml b/.zuul.yaml
index 546a702215..718c8ee45b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -30,24 +30,36 @@
 - job:
     name: zuul-stream-functional-2.5
     parent: zuul-stream-functional
+    # Force executor to use same Ansible version as "controller" node so
+    # that the inventory.yaml file will be correct for that version.
+    ansible-version: 2.5
     vars:
       zuul_ansible_version: 2.5
 
 - job:
     name: zuul-stream-functional-2.6
     parent: zuul-stream-functional
+    # Force executor to use same Ansible version as "controller" node so
+    # that the inventory.yaml file will be correct for that version.
+    ansible-version: 2.6
     vars:
       zuul_ansible_version: 2.6
 
 - job:
     name: zuul-stream-functional-2.7
     parent: zuul-stream-functional
+    # Force executor to use same Ansible version as "controller" node so
+    # that the inventory.yaml file will be correct for that version.
+    ansible-version: 2.7
     vars:
       zuul_ansible_version: 2.7
 
 - job:
     name: zuul-stream-functional-2.8
     parent: zuul-stream-functional
+    # Force executor to use same Ansible version as "controller" node so
+    # that the inventory.yaml file will be correct for that version.
+    ansible-version: 2.8
     vars:
       zuul_ansible_version: 2.8
 
diff --git a/playbooks/zuul-stream/functional.yaml b/playbooks/zuul-stream/functional.yaml
index bf4f10a348..d3a73d7f93 100644
--- a/playbooks/zuul-stream/functional.yaml
+++ b/playbooks/zuul-stream/functional.yaml
@@ -53,23 +53,23 @@
 
     - name: Validate output - shell task with exception
       shell: |
-        egrep "^.+\| node1 \| OSError.+\/shelltask\/" job-output.txt
-        egrep "^.+\| node2 \| OSError.+\/shelltask\/" job-output.txt
+        egrep "^.+\| node1 \| (OSError|FileNotFoundError).+\/shelltask\/" job-output.txt
+        egrep "^.+\| node2 \| (OSError|FileNotFoundError).+\/shelltask\/" job-output.txt
 
     - name: Validate output - item loop with exception
       shell: |
-        egrep "^.+\| node1 \| OSError.+\/itemloop\/" job-output.txt
-        egrep "^.+\| node2 \| OSError.+\/itemloop\/" job-output.txt
+        egrep "^.+\| node1 \| (OSError|FileNotFoundError).+\/itemloop\/" job-output.txt
+        egrep "^.+\| node2 \| (OSError|FileNotFoundError).+\/itemloop\/" job-output.txt
 
     - name: Validate output - failure shell task with exception
       shell: |
-        egrep "^.+\| node1 \| OSError.+\/failure-shelltask\/" job-output.txt
-        egrep "^.+\| node2 \| OSError.+\/failure-shelltask\/" job-output.txt
+        egrep "^.+\| node1 \| (OSError|FileNotFoundError).+\/failure-shelltask\/" job-output.txt
+        egrep "^.+\| node2 \| (OSError|FileNotFoundError).+\/failure-shelltask\/" job-output.txt
 
     - name: Validate output - failure item loop with exception
       shell: |
-        egrep "^.+\| node1 \| OSError.+\/failure-itemloop\/" job-output.txt
-        egrep "^.+\| node2 \| OSError.+\/failure-itemloop\/" job-output.txt
+        egrep "^.+\| node1 \| (OSError|FileNotFoundError).+\/failure-itemloop\/" job-output.txt
+        egrep "^.+\| node2 \| (OSError|FileNotFoundError).+\/failure-itemloop\/" job-output.txt
 
     - name: Validate output - binary data
       shell: |