Index: mergebot/trunk/utils/test.py
===================================================================
--- mergebot/trunk/utils/test.py	(revision 17)
+++ mergebot/trunk/utils/test.py	(revision 40)
@@ -12,5 +12,6 @@
 
 
-from trac.tests.functional import FunctionalTestSuite, FunctionalTestEnvironment, FunctionalTester, FunctionalTwillTestCaseSetup, tc, b, logfile
+from trac.tests.functional import FunctionalTestSuite, FunctionalTester, FunctionalTwillTestCaseSetup, tc, b, logfile
+from trac.tests.functional.svntestenv import SvnFunctionalTestEnvironment
 from trac.tests.contentgen import random_page #, random_sentence, random_word
 
@@ -148,26 +149,20 @@
         port = 8889
         baseurl = "http://localhost:%s" % port
-        self._testenv = FunctionalTestEnvironment("testenv%s" % port, port, baseurl)
+        self._testenv = SvnFunctionalTestEnvironment("testenv%s" % port, port, baseurl)
 
         # Configure mergebot
         env = self._testenv.get_trac_environment()
         env.config.set('components', 'mergebot.web_ui.mergebotmodule', 'enabled')
+        env.config.save()
+        self._testenv._tracadmin('upgrade') # sets up the bulk of the mergebot config
+        env.config.parse_if_needed()
         env.config.set('mergebot', 'repository_url', self._testenv.repo_url())
-        env.config.set('mergebot', 'work_dir', self._testenv.repodir + '/mergebot')
-
-        env.config.set('ticket-custom', 'mergebotstate', 'select')
-        env.config.set('ticket-custom', 'mergebotstate.editable', '0')
-        env.config.set('ticket-custom', 'mergebotstate.label', 'MergeBotState')
-        env.config.set('ticket-custom', 'mergebotstate.options', '| tomerge | merged | tobranch | branched | conflicts')
-        env.config.set('ticket-custom', 'mergebotstate.order', '2')
-        env.config.set('ticket-custom', 'mergebotstate.value', '')
-
         env.config.set('logging', 'log_type', 'file')
-
         env.config.save()
         env.config.parse_if_needed()
 
         self._testenv.start()
-        self._tester = MergeBotFunctionalTester(baseurl, self._testenv.repo_url())
+        self._tester = MergeBotFunctionalTester(baseurl)
+        self.fixture = (self._testenv, self._tester)
 
         # Setup some common component stuff for MergeBot's use: