diff --git a/django/contrib/staticfiles/handlers.py b/django/contrib/staticfiles/handlers.py
index 669ffaeabc..b51b7c8fd5 100644
--- a/django/contrib/staticfiles/handlers.py
+++ b/django/contrib/staticfiles/handlers.py
@@ -2,7 +2,6 @@ import urllib
 from urlparse import urlparse
 
 from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured
 from django.core.handlers.wsgi import WSGIHandler
 
 from django.contrib.staticfiles import utils
diff --git a/tests/regressiontests/staticfiles_tests/tests.py b/tests/regressiontests/staticfiles_tests/tests.py
index 1fb043c715..d524254f3c 100644
--- a/tests/regressiontests/staticfiles_tests/tests.py
+++ b/tests/regressiontests/staticfiles_tests/tests.py
@@ -286,7 +286,7 @@ class TestServeStatic(StaticFilesTestCase):
 
 class TestServeDisabled(TestServeStatic):
     """
-    Test serving media from django.contrib.admin.
+    Test serving static files disabled when DEBUG is False.
     """
     def setUp(self):
         super(TestServeDisabled, self).setUp()
@@ -300,7 +300,7 @@ class TestServeDisabled(TestServeStatic):
 
 class TestServeStaticWithDefaultURL(TestServeStatic, TestDefaults):
     """
-    Test static asset serving view with staticfiles_urlpatterns helper.
+    Test static asset serving view with manually configured URLconf.
     """
     pass
 
diff --git a/tests/regressiontests/staticfiles_tests/urls/default.py b/tests/regressiontests/staticfiles_tests/urls/default.py
index 061ec6465e..5788268175 100644
--- a/tests/regressiontests/staticfiles_tests/urls/default.py
+++ b/tests/regressiontests/staticfiles_tests/urls/default.py
@@ -1,5 +1,4 @@
-from django.conf import settings
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns, url
 
 urlpatterns = patterns('',
     url(r'^static/(?P<path>.*)$', 'django.contrib.staticfiles.views.serve'),