diff --git a/.zuul.yaml b/.zuul.yaml
index d4445de..8bb7c30 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -13,14 +13,17 @@
 - job:
     name: ec2-api-functional-neutron-ussuri
     parent: ec2-api-functional-neutron
+    nodeset: openstack-single-node-bionic
     override-checkout: stable/ussuri
 
 - job:
     name: ec2-api-functional-neutron-train
     parent: ec2-api-functional-neutron
+    nodeset: openstack-single-node-bionic
     override-checkout: stable/train
 
 - job:
     name: ec2-api-functional-neutron-stein
     parent: ec2-api-functional-neutron
+    nodeset: openstack-single-node-bionic
     override-checkout: stable/stein     
diff --git a/ec2api_tempest_plugin/base.py b/ec2api_tempest_plugin/base.py
index b97fd54..8fcd49e 100644
--- a/ec2api_tempest_plugin/base.py
+++ b/ec2api_tempest_plugin/base.py
@@ -438,7 +438,7 @@ class EC2TestCase(base.BaseTestCase):
                     obj_id = obj_id(kw_args)
                     try:
                         waiter().wait_delete(obj_id)
-                    except botocore.exceptions.ClientError as e:
+                    except botocore.exceptions.ClientError:
                         LOG.exception('Exception occurred in cleanup waiting')
                         return False
             except botocore.exceptions.ClientError as e:
diff --git a/test-requirements.txt b/test-requirements.txt
index c43a3e0..4dd60c5 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,3 +3,8 @@
 # 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