--- a/pylib/mozreview/mozreview/tests/test-autoland-try.py
+++ b/pylib/mozreview/mozreview/tests/test-autoland-try.py
@@ -114,17 +114,17 @@ class AutolandTryTest(MozReviewWebDriver
 
         # the try job should eventually create a new change description
         WebDriverWait(self.browser, 10).until(
             EC.visibility_of_element_located((By.CLASS_NAME, 'changedesc'))
         )
 
         time.sleep(10)
         self.browser.refresh()
-        changedesc = self.browser.find_elements_by_class_name('changedesc')[2]
+        changedesc = self.browser.find_elements_by_class_name('changedesc')[1]
         self.assertTrue('https://treeherder.mozilla.org/'
             in changedesc.get_attribute('innerHTML'))
 
         # We should not have closed the review automatically
         with self.assertRaises(NoSuchElementException):
             self.browser.find_element_by_id('submitted-banner')
 
         # We should not be able to trigger a Try run for another user.

--- a/pylib/mozreview/mozreview/tests/test-browser-cache.py
+++ b/pylib/mozreview/mozreview/tests/test-browser-cache.py
@@ -28,20 +28,20 @@ class BrowserCacheTest(MozReviewWebDrive
 
             self.create_ldap(b'user1@example.com', b'user1', 2001, b'User One')
 
             bb = self.user_bugzilla('user1@example.com')
             bb.create_bug('TestProduct', 'TestComponent', 'First Bug')
 
             lr = self.create_basic_repo('user1@example.com', 'user1')
             lr.write('foo', 'first change')
-            lr.run(['commit', '-m', 'Bug 1 - Commit 1'])
+            lr.run(['commit', '-m', 'Bug 1 - Commit 1. r?user2'])
             lr.write('foo', 'second change')
-            lr.run(['commit', '-m', 'Bug 1 - Commit 2'])
-            lr.run(['push'])
+            lr.run(['commit', '-m', 'Bug 1 - Commit 2. r?user2'])
+            lr.run(['push', '--config', 'reviewboard.autopublish=true'])
         except Exception:
             MozReviewWebDriverTest.tearDownClass()
             raise
 
     def test_browser_cache(self):
         """Test that browser caching is properly invalidated"""
         self.reviewboard_login('user1@example.com', 'password')
 
@@ -71,17 +71,17 @@ class BrowserCacheTest(MozReviewWebDrive
 
         finish_btn = WebDriverWait(self.browser, 3).until(
             EC.visibility_of_element_located((
                 By.XPATH,
                 "id('review-banner-edit')"
             )))
         finish_btn.click()
 
-        publish_btn = WebDriverWait(self.browser, 3).until(
+        publish_btn = WebDriverWait(self.browser, 5).until(
             EC.visibility_of_element_located((
                 By.XPATH,
                 "id('review-form-modalbox')/div[1]/div[2]/input[1]"
             )))
         publish_btn.click()
 
         # Wait until we've been redirected to the reviews page
         WebDriverWait(self.browser, 3).until(

--- a/pylib/mozreview/mozreview/tests/test-filediffreviewer-buttons.py
+++ b/pylib/mozreview/mozreview/tests/test-filediffreviewer-buttons.py
@@ -30,20 +30,20 @@ class FileDiffReviewerTest(MozReviewWebD
                              b'mjane', 2001, b'Mary Jane')
 
             bb = self.user_bugzilla('mjane@example.com')
             bb.create_bug('TestProduct', 'TestComponent', 'First Bug')
 
             lr = self.create_basic_repo('mjane@example.com', 'mjane')
             lr.write('foo', 'first change')
             lr.run(['commit', '-m', 'Bug 1 - Test try;r=jsmith'])
-            lr.run(['push'])
+            lr.run(['push', '--config', 'reviewboard.autopublish=true'])
             lr.write('foo', 'second change')
             lr.run(['commit', '-m', 'second change;r=jsmith'])
-            lr.run(['push'])
+            lr.run(['push', '--config', 'reviewboard.autopublish=true'])
         except Exception:
             MozReviewWebDriverTest.tearDownClass()
             raise
 
     def _element_is_present(self, selector, timeout=10):
         try:
             WebDriverWait(self.browser, timeout).until(
                 EC.presence_of_element_located(selector))

--- a/testing/vcttesting/mozreview.py
+++ b/testing/vcttesting/mozreview.py
@@ -681,16 +681,19 @@ class LocalMercurialRepository(object):
                 'backout = -d "0 0"',
                 'commit = -d "0 0"',
                 'shelve = --date "0 0"',
                 'tag = -d "0 0"',
                 '',
                 '[extensions]',
                 'reviewboard = %s' % reviewboard,
                 '',
+                '[reviewboard]',
+                'autopublish = false',
+                '',
             ]))
 
     def run(self, args):
         cmd = [self.hg, '--config', 'ui.interactive=false']
         cmd.extend(args)
 
         env = dict(os.environ)
         env['HGUSER'] = 'test'