diff --git a/flask.py b/flask.py
index c1229d6e..02014fd2 100644
--- a/flask.py
+++ b/flask.py
@@ -12,7 +12,6 @@
 from __future__ import with_statement
 import os
 import sys
-import types
 from datetime import datetime, timedelta
 
 from jinja2 import Environment, PackageLoader, FileSystemLoader
diff --git a/tests/flask_tests.py b/tests/flask_tests.py
index f9369e36..f8f74264 100644
--- a/tests/flask_tests.py
+++ b/tests/flask_tests.py
@@ -255,17 +255,17 @@ class BasicFunctionalityTestCase(unittest.TestCase):
                 == '/static/index.html'
 
     def test_none_response(self):
-        warnings.filterwarnings('error', 'View function did not return')
         app = flask.Flask(__name__)
         @app.route('/')
         def test():
             return None
         try:
             app.test_client().get('/')
-        except Warning:
+        except ValueError, e:
+            assert str(e) == 'View function did not return a response'
             pass
         else:
-            assert "Expected warning"
+            assert "Expected ValueError"
 
 
 class JSONTestCase(unittest.TestCase):