diff --git a/openstack_dashboard/dashboards/admin/info/tables.py b/openstack_dashboard/dashboards/admin/info/tables.py
index bfe4f2dd54..952da99672 100644
--- a/openstack_dashboard/dashboards/admin/info/tables.py
+++ b/openstack_dashboard/dashboards/admin/info/tables.py
@@ -1,6 +1,7 @@
 import logging
 
 from django.utils.translation import ugettext_lazy as _
+from django import template
 
 from horizon import tables
 
diff --git a/openstack_dashboard/dashboards/project/loadbalancers/tests.py b/openstack_dashboard/dashboards/project/loadbalancers/tests.py
index e34ce25fab..d59884cc7c 100644
--- a/openstack_dashboard/dashboards/project/loadbalancers/tests.py
+++ b/openstack_dashboard/dashboards/project/loadbalancers/tests.py
@@ -8,8 +8,6 @@ from django import http
 
 from horizon.workflows.views import WorkflowView
 
-from mox import IsA
-
 from openstack_dashboard import api
 from openstack_dashboard.api.lbaas import Member
 from openstack_dashboard.api.lbaas import Pool
diff --git a/openstack_dashboard/dashboards/project/networks/tests.py b/openstack_dashboard/dashboards/project/networks/tests.py
index ddd66bab79..c660c4a086 100644
--- a/openstack_dashboard/dashboards/project/networks/tests.py
+++ b/openstack_dashboard/dashboards/project/networks/tests.py
@@ -668,7 +668,7 @@ class NetworkSubnetTests(test.TestCase):
 
     @test.create_stubs({api.quantum: ('network_get',
                                       'subnet_create',)})
-    def test_subnet_create_post_with_additional_attributes(self):
+    def test_subnet_create_post_with_additional_attributes_no_gateway(self):
         network = self.networks.first()
         subnet = self.subnets.first()
         api.quantum.network_get(IsA(http.HttpRequest),
@@ -988,29 +988,6 @@ class NetworkSubnetTests(test.TestCase):
                             'host_routes: Invalid IP address '
                             '(value=%s)' % host_routes.split(',')[1])
 
-    @test.create_stubs({api.quantum: ('subnet_modify',
-                                      'subnet_get',)})
-    def test_subnet_update_post(self):
-        subnet = self.subnets.first()
-        api.quantum.subnet_get(IsA(http.HttpRequest), subnet.id)\
-            .AndReturn(subnet)
-        api.quantum.subnet_modify(IsA(http.HttpRequest), subnet.id,
-                                  name=subnet.name,
-                                  gateway_ip=subnet.gateway_ip,
-                                  enable_dhcp=subnet.enable_dhcp)\
-            .AndReturn(subnet)
-        self.mox.ReplayAll()
-
-        form_data = form_data_subnet(subnet,
-                                     allocation_pools=[])
-        url = reverse('horizon:project:networks:editsubnet',
-                      args=[subnet.network_id, subnet.id])
-        res = self.client.post(url, form_data)
-
-        redir_url = reverse('horizon:project:networks:detail',
-                            args=[subnet.network_id])
-        self.assertRedirectsNoFollow(res, redir_url)
-
     @test.create_stubs({api.quantum: ('subnet_modify',
                                       'subnet_get',)})
     def test_subnet_update_post(self):
diff --git a/openstack_dashboard/dashboards/settings/password/forms.py b/openstack_dashboard/dashboards/settings/password/forms.py
index c87510ea32..54b7c80eb5 100644
--- a/openstack_dashboard/dashboards/settings/password/forms.py
+++ b/openstack_dashboard/dashboards/settings/password/forms.py
@@ -14,7 +14,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.utils.translation import ugettext_lazy as _
 from django.forms import ValidationError
 from django.utils.translation import ugettext_lazy as _
 from django.views.decorators.debug import sensitive_variables
diff --git a/tox.ini b/tox.ini
index edc2054b0d..21b74924b8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -38,8 +38,6 @@ exclude =  .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,p
 # E128 continuation line under-indented for visual indent
 # F401 '<smth>' imported but unused
 # F403 'from <smth> import *' used; unable to detect undefined names
-# F811 redefinition of unused '<smth>' from line <line_#>
-# F821 undefined name '<smth>'
 # F841 local variable '<smth>' is assigned to but never used
 # F999 syntax error in doctest
 # H201 no 'except:' at least use 'except Exception:'
@@ -50,4 +48,4 @@ exclude =  .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,p
 # H4xx docstrings
 # H701 empty localization string
 # H702  Formatting operation should be outside of localization method call
-ignore = E121,E126,E127,E128,F403,F811,F821,F841,F999,H201,H302,H303,H304,H306,H4,H701,H702
+ignore = E121,E126,E127,E128,F403,F841,F999,H201,H302,H303,H304,H306,H4,H701,H702