diff --git a/.mailmap b/.mailmap
index 771ab6560c..f59873d1b2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -9,3 +9,4 @@
 <ke.wu@ibeca.me> <ke.wu@nebula.com>
 Zhongyue Luo <zhongyue.nah@intel.com> <lzyeval@gmail.com>
 Joe Gordon <joe.gordon0@gmail.com> <jogo@cloudscaling.com>
+Kun Huang <gareth@unitedstack.com> <academicgareth@gmail.com>
diff --git a/horizon/forms/__init__.py b/horizon/forms/__init__.py
index 611d59b791..4df93321bb 100644
--- a/horizon/forms/__init__.py
+++ b/horizon/forms/__init__.py
@@ -15,7 +15,7 @@
 #    under the License.
 
 # FIXME(gabriel): Legacy imports for API compatibility.
-from django.forms import *
+from django.forms import *  # noqa
 from django.forms import widgets
 
 # Convenience imports for public API components.
diff --git a/openstack_dashboard/dashboards/project/images_and_snapshots/urls.py b/openstack_dashboard/dashboards/project/images_and_snapshots/urls.py
index bb0704c540..2e2b4cd655 100644
--- a/openstack_dashboard/dashboards/project/images_and_snapshots/urls.py
+++ b/openstack_dashboard/dashboards/project/images_and_snapshots/urls.py
@@ -18,7 +18,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import include
+from django.conf.urls.defaults import patterns
+from django.conf.urls.defaults import url
 
 from openstack_dashboard.dashboards.project.images_and_snapshots.images \
     import urls as image_urls
diff --git a/openstack_dashboard/dashboards/project/instances/workflows/__init__.py b/openstack_dashboard/dashboards/project/instances/workflows/__init__.py
index 1525d96462..2c19082f85 100644
--- a/openstack_dashboard/dashboards/project/instances/workflows/__init__.py
+++ b/openstack_dashboard/dashboards/project/instances/workflows/__init__.py
@@ -1,3 +1,7 @@
-from create_instance import *
-from update_instance import *
-from resize_instance import *
+from create_instance import LaunchInstance
+from resize_instance import ResizeInstance
+from update_instance import UpdateInstance
+
+assert LaunchInstance
+assert UpdateInstance
+assert ResizeInstance
diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py
index 9613f5892e..b05cd98c54 100644
--- a/openstack_dashboard/settings.py
+++ b/openstack_dashboard/settings.py
@@ -179,7 +179,7 @@ OPENSTACK_KEYSTONE_DEFAULT_ROLE = 'Member'
 DEFAULT_EXCEPTION_REPORTER_FILTER = 'horizon.exceptions.HorizonReporterFilter'
 
 try:
-    from local.local_settings import *
+    from local.local_settings import *  # noqa
 except ImportError:
     logging.warning("No local_settings file found.")
 
diff --git a/openstack_dashboard/test/settings.py b/openstack_dashboard/test/settings.py
index c89b2b35b3..dfcaa22c7d 100644
--- a/openstack_dashboard/test/settings.py
+++ b/openstack_dashboard/test/settings.py
@@ -2,7 +2,7 @@ import os
 
 from django.utils.translation import ugettext_lazy as _
 
-from horizon.test.settings import *
+from horizon.test.settings import *  # noqa
 from horizon.utils.secret_key import generate_or_read_from_file
 
 from openstack_dashboard.exceptions import NOT_FOUND
diff --git a/tox.ini b/tox.ini
index b31c67d3a2..e413e8d418 100644
--- a/tox.ini
+++ b/tox.ini
@@ -40,8 +40,7 @@ exclude =  .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,p
 # F999 syntax error in doctest
 # H201 no 'except:' at least use 'except Exception:'
 # H302 import only modules.'from optparse import make_option' does not import a module
-# H303 No wildcard (*) import.
 # H4xx docstrings
 # H701 empty localization string
 # H702  Formatting operation should be outside of localization method call
-ignore = E121,E126,E127,E128,F403,F999,H201,H302,H303,H4,H701,H702
+ignore = E121,E126,E127,E128,F403,F999,H201,H302,H4,H701,H702