diff --git a/tests/setup.py b/tests/setup.py
index c411368..a5eca5a 100644
--- a/tests/setup.py
+++ b/tests/setup.py
@@ -82,8 +82,6 @@ class TestSite(object):
         self.site = site
 
     def baseSetup(self):
-        site = self.site
-
         #oldPolicy = setSecurityPolicy(ZopeSecurityPolicy)
         oldPolicy = setSecurityPolicy(LoopsSecurityPolicy)
         checker = Checker(dict(title='zope.View', data='zope.View', body='zope.View'),
@@ -159,13 +157,14 @@ class TestSite(object):
         component.provideAdapter(StatefulResourceIndexInfo)
         component.provideHandler(handleTransition)
 
-        loopsRoot = site['loops'] = Loops()
+        loopsRoot = self.site['loops'] = Loops()
         setup = SetupManager(loopsRoot)
         concepts, resources, views = setup.setup()
         return concepts, resources, views
 
     def setup(self):
         concepts, resources, views = self.baseSetup()
+
         catalog = component.getUtility(ICatalog)
 
         tType = concepts.getTypeConcept()
@@ -189,6 +188,11 @@ class TestSite(object):
         self.indexAll(concepts, resources)
         return concepts, resources, views
 
+    def siteSetup(self, rootName='loops'):
+        loopsRoot = self.site[rootName] = Loops()
+        setup = SetupManager(loopsRoot)
+        return setup.setup()
+
     def indexAll(self, concepts, resources):
         for c in concepts.values():
              self.catalog.index_doc(int(util.getUidForObject(c)), c)