Index: main/waeup.sirp/trunk/src/waeup/sirp/university/certificate.txt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/university/certificate.txt	(revision 5070)
+++ main/waeup.sirp/trunk/src/waeup/sirp/university/certificate.txt	(revision 5140)
@@ -6,12 +6,6 @@
 Components that represent and manage certificates.
 
-:Test-Layer: unit
-
-Because certificates make use of components registered with the Zope
-Component Architecture (ZCA), we first have to grok the `waeup`
-package. This happens automatically in real-world use:
-
-    >>> import grok
-    >>> grok.testing.grok('waeup')
+.. :doctest:
+.. :layer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
 
 
Index: main/waeup.sirp/trunk/src/waeup/sirp/university/certificatecontainer.txt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/university/certificatecontainer.txt	(revision 5070)
+++ main/waeup.sirp/trunk/src/waeup/sirp/university/certificatecontainer.txt	(revision 5140)
@@ -6,13 +6,7 @@
 Containers for certificates.
 
-:Test-Layer: unit
+.. :doctest:
+.. :layer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
 
-Because this module makes use of components registered with the Zope
-Component Architecture (ZCA), we first have to grok the `waeup`
-package if we want to deploy it. This happens automatically in
-real-world use:
-
-    >>> import grok
-    >>> grok.testing.grok('waeup')
 
 Content Classes (models and containers)
Index: main/waeup.sirp/trunk/src/waeup/sirp/university/course.txt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/university/course.txt	(revision 5070)
+++ main/waeup.sirp/trunk/src/waeup/sirp/university/course.txt	(revision 5140)
@@ -6,13 +6,6 @@
 Components that represent courses.
 
-:Test-Layer: unit
-
-Because this module makes use of components registered with the Zope
-Component Architecture (ZCA), we first have to grok the `waeup`
-package if we want to deploy it. This happens automatically in
-real-world use:
-
-    >>> import grok
-    >>> grok.testing.grok('waeup')
+.. :doctest:
+.. :layer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
 
 Content Classes (models and containers)
Index: main/waeup.sirp/trunk/src/waeup/sirp/university/coursecontainer.txt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/university/coursecontainer.txt	(revision 5070)
+++ main/waeup.sirp/trunk/src/waeup/sirp/university/coursecontainer.txt	(revision 5140)
@@ -6,13 +6,7 @@
 Containers for courses.
 
-:Test-Layer: unit
+.. :doctest:
+.. :layer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
 
-Because this module makes use of components registered with the Zope
-Component Architecture (ZCA), we first have to grok the `waeup`
-package if we want to deploy it. This happens automatically in
-real-world use:
-
-    >>> import grok
-    >>> grok.testing.grok('waeup')
 
 Content Classes (models and containers)
Index: main/waeup.sirp/trunk/src/waeup/sirp/university/department.txt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/university/department.txt	(revision 5070)
+++ main/waeup.sirp/trunk/src/waeup/sirp/university/department.txt	(revision 5140)
@@ -6,12 +6,6 @@
 Components that represent university departments.
 
-:Test-Layer: unit
-
-Before we can create departments, we have to grok the :mod:`waeup`
-package. This happens automatically in real-world use:
-
-    >>> import grok
-    >>> grok.testing.grok('waeup')
-
+.. :doctest:
+.. :layer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
 
 Content Classes (models and containers)
Index: main/waeup.sirp/trunk/src/waeup/sirp/university/faculty.txt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/university/faculty.txt	(revision 5070)
+++ main/waeup.sirp/trunk/src/waeup/sirp/university/faculty.txt	(revision 5140)
@@ -6,11 +6,7 @@
 Components that represent university faculties.
 
-:Test-Layer: unit
-
-Before we can create faculties, we have to grok the :mod:`waeup`
-package. This happens automatically in real-world use:
-
-    >>> import grok
-    >>> grok.testing.grok('waeup')
+.. :doctest:
+.. :layer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
+
 
 Content Classes (models and containers)
Index: main/waeup.sirp/trunk/src/waeup/sirp/university/facultycontainer.txt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/university/facultycontainer.txt	(revision 5070)
+++ main/waeup.sirp/trunk/src/waeup/sirp/university/facultycontainer.txt	(revision 5140)
@@ -6,12 +6,6 @@
 Components that represent faculty containers.
 
-:Test-Layer: unit
-
-Before we can create faculty containers, we have to grok the
-:mod:`waeup.sirp` package. This happens automatically in real-world
-use:
-
-    >>> import grok
-    >>> grok.testing.grok('waeup.sirp')
+.. :doctest:
+.. :layer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
 
 
