diff --git a/pecan/tests/__init__.py b/pecan/tests/__init__.py
index b9c2b61..4d2df74 100644
--- a/pecan/tests/__init__.py
+++ b/pecan/tests/__init__.py
@@ -17,4 +17,4 @@ class PecanTestCase(TestCase):
             dict(configuration.initconf()),
             overwrite=True
         )
-        os.environ['PECAN_CONFIG'] = ''
+        os.environ.pop('PECAN_CONFIG', None)
diff --git a/pecan/tests/middleware/test_errordocument.py b/pecan/tests/middleware/test_errordocument.py
index a5d3c9c..92c4c08 100644
--- a/pecan/tests/middleware/test_errordocument.py
+++ b/pecan/tests/middleware/test_errordocument.py
@@ -18,10 +18,10 @@ def four_oh_four_app(environ, start_response):
     return []
 
 
-class TestDebugMiddleware(PecanTestCase):
+class TestErrorDocumentMiddleware(PecanTestCase):
 
     def setUp(self):
-        super(TestDebugMiddleware, self).setUp()
+        super(TestErrorDocumentMiddleware, self).setUp()
         self.app = TestApp(RecursiveMiddleware(ErrorDocumentMiddleware(
             four_oh_four_app, {404: '/error/404'}
         )))