1 files changed, 8 insertions, 12 deletions
diff --git a/docs/tutorials/wiki2/src/views/tutorial/tests.py b/docs/tutorials/wiki2/src/views/tutorial/tests.py
index 7b770f927..b9797df67 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/tests.py
+++ b/docs/tutorials/wiki2/src/views/tutorial/tests.py
@@ -1,6 +1,5 @@
 import unittest
 
-from pyramid.config import Configurator
 from pyramid import testing
 
 def _initTestingDB():
@@ -20,11 +19,10 @@ def _registerRoutes(config):
 
 class ViewWikiTests(unittest.TestCase):
     def setUp(self):
-        self.config = Configurator(autocommit=True)
-        self.config.begin()
+        self.config = testing.setUp()
 
     def tearDown(self):
-        self.config.end()
+        testing.tearDown()
         
     def test_it(self):
         from tutorial.views import view_wiki
@@ -36,12 +34,11 @@ class ViewWikiTests(unittest.TestCase):
 class ViewPageTests(unittest.TestCase):
     def setUp(self):
         self.session = _initTestingDB()
-        self.config = Configurator(autocommit=True)
-        self.config.begin()
+        self.config = testing.setUp()
 
     def tearDown(self):
         self.session.remove()
-        self.config.end()
+        testing.tearDown()
         
     def _callFUT(self, request):
         from tutorial.views import view_page
@@ -71,12 +68,12 @@ class ViewPageTests(unittest.TestCase):
 class AddPageTests(unittest.TestCase):
     def setUp(self):
         self.session = _initTestingDB()
-        self.config = Configurator(autocommit=True)
+        self.config = testing.setUp()
         self.config.begin()
 
     def tearDown(self):
         self.session.remove()
-        self.config.end()
+        testing.tearDown()
 
     def _callFUT(self, request):
         from tutorial.views import add_page
@@ -104,12 +101,11 @@ class AddPageTests(unittest.TestCase):
 class EditPageTests(unittest.TestCase):
     def setUp(self):
         self.session = _initTestingDB()
-        self.config = Configurator(autocommit=True)
-        self.config.begin()
+        self.config = testing.setUp()
 
     def tearDown(self):
         self.session.remove()
-        self.config.end()
+        testing.tearDown()
 
     def _callFUT(self, request):
         from tutorial.views import edit_page