Index: tests/test_doctests.py
===================================================================
--- tests/test_doctests.py	(revision 120009)
+++ tests/test_doctests.py	(working copy)
@@ -17,26 +17,45 @@
 
 import zope.testbrowser.ftests.wsgitestapp
 import zope.testbrowser.webtest
+import zope.testbrowser.wsgi
 
-def make_browser(*args, **kw):
+def make_webtest_browser(*args, **kw):
     app = zope.testbrowser.ftests.wsgitestapp.WSGITestApplication()
     return zope.testbrowser.webtest.Browser(app, *args, **kw)
 
+
+class WsgiInterceptLayer(zope.testbrowser.wsgi.Layer):
+
+    def make_wsgi_app(self):
+        return zope.testbrowser.ftests.wsgitestapp.WSGITestApplication()
+
+
 def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
 
-    suite = doctest.DocFileSuite(
+    webtest_suite = doctest.DocFileSuite(
         'README.txt',
         'cookies.txt',
         'wsgi.txt',
         'fixed-bugs.txt',
         optionflags=flags,
-        globs=dict(Browser=make_browser),
+        globs=dict(Browser=make_webtest_browser),
         checker=zope.testbrowser.tests.helper.checker,
         package='zope.testbrowser')
 
+    wsgi_suite = doctest.DocFileSuite(
+        'README.txt',
+        'cookies.txt',
+        'wsgi.txt',
+        'fixed-bugs.txt',
+        optionflags=flags,
+        globs=dict(Browser=zope.testbrowser.wsgi.Browser),
+        checker=zope.testbrowser.tests.helper.checker,
+        package='zope.testbrowser')
+    wsgi_suite.layer = WsgiInterceptLayer()
+
     wire = doctest.DocFileSuite('over_the_wire.txt', optionflags=flags,
                                 package='zope.testbrowser')
     wire.level = 2
 
-    return unittest.TestSuite((suite, wire))
+    return unittest.TestSuite((wsgi_suite, webtest_suite, wire))