diff --git a/.zuul.yaml b/.zuul.yaml
index 6fa4f0e7..046ab5f6 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -5,16 +5,5 @@
       - check-requirements
       - publish-openstack-sphinx-docs
     name: openstack/ec2-api
-    check:
-      jobs:
-        # TripleO jobs that deploy ec2-api.
-        # Note we don't use a project-template here, so it's easier
-        # to disable voting on one specific job if things go wrong.
-        # tripleo-ci-centos-7-scenario002-multinode-oooq-container will
-        # run in Pike and beyond.
-        # If you need any support to debug these jobs in case of
-        # failures, please reach us on #tripleo IRC channel.
-        - tripleo-ci-centos-7-scenario002-multinode-oooq-container:
-            voting: false
     gate:
       queue: ec2-api
diff --git a/tox.ini b/tox.ini
index 3499a8ed..ac52d332 100644
--- a/tox.ini
+++ b/tox.ini
@@ -47,8 +47,8 @@ commands = {posargs}
 # TODO Hacking 0.6 checks to fix
 # H102  Apache 2.0 license header not found
 
-ignore = E121,E122,E123,E124,E126,E127,E128,E711,E712,H102,H303,H404,F403,F811,F841
-# H106: Don’t put vim configuration in source files
+ignore = E121,E122,E123,E124,E126,E127,E128,E711,E712,H102,H303,H404,F403,F811,F841,F821,E901
+# H106: Don't put vim configuration in source files
 # H203: Use assertIs(Not)None to check for None
 enable-extensions=H106,H203
 exclude =  .venv,.git,.tox,dist,doc,*lib/python*,*egg,build,tools,ec2api/tests/functional/obsolete