diff --git a/.zuul.yaml b/.zuul.yaml
index 287fdff..dc2a3af 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,6 +1,7 @@
 - job:
     name: heat-functional-convg-stein
     parent: heat-functional-convg-mysql-lbaasv2-py3
+    nodeset: openstack-single-node-bionic
     override-checkout: stable/stein
     vars:
       branch_override: stable/stein
@@ -8,6 +9,7 @@
 - job:
     name: heat-functional-orig-stein
     parent: heat-functional-orig-mysql-lbaasv2
+    nodeset: openstack-single-node-bionic
     override-checkout: stable/stein
     vars:
       branch_override: stable/stein
@@ -16,6 +18,7 @@
 - job:
     name: heat-functional-convg-train
     parent: heat-functional-convg-mysql-lbaasv2-py3
+    nodeset: openstack-single-node-bionic
     override-checkout: stable/train
     vars:
       branch_override: stable/train
@@ -23,6 +26,7 @@
 - job:
     name: heat-functional-orig-train
     parent: heat-functional-orig-mysql-lbaasv2
+    nodeset: openstack-single-node-bionic
     override-checkout: stable/train
     vars:
       branch_override: stable/train
@@ -31,6 +35,7 @@
 - job:
     name: heat-functional-ussuri
     parent: heat-functional
+    nodeset: openstack-single-node-bionic
     override-checkout: stable/ussuri
 
 - project:
diff --git a/test-requirements.txt b/test-requirements.txt
index c699d8c..3cd55cb 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,4 +4,7 @@
 
 # Hacking already pins down pep8, pyflakes and flake8
 hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
-
+# remove this pyflakes from here once you bump the
+# hacking to 3.2.0 or above. hacking 3.2.0 takes
+# care of pyflakes version compatibilty.
+pyflakes>=2.1.1