diff --git a/.zuul.yaml b/.zuul.yaml
index a767f05..8ea58e6 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -19,11 +19,13 @@
 - job:
     name: watcher-tempest-functional-ussuri
     parent: watcher-tempest-functional
+    nodeset: openstack-single-node-bionic
     override-checkout: stable/ussuri
 
 - job:
     name: watcher-tempest-functional-train
     parent: watcher-tempest-functional
+    nodeset: openstack-single-node-bionic
     override-checkout: stable/train
     vars:
       devstack_localrc:
@@ -32,6 +34,7 @@
 - job:
     name: watcher-tempest-functional-stein
     parent: watcher-tempest-functional
+    nodeset: openstack-single-node-bionic
     override-checkout: stable/stein
     vars:
       devstack_localrc:
diff --git a/test-requirements.txt b/test-requirements.txt
index 037acf9..32d0800 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,6 +3,10 @@
 # process, which may cause wedges in the gate later.
 
 hacking<0.13,>=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
 
 coverage!=4.4,>=4.0 # Apache-2.0
 doc8>=0.6.0 # Apache-2.0