From f1d6a3425fe9518599292e85a907a2f3dc6afde0 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 23 Aug 2016 04:30:39 -0700
Subject: [PATCH] CiviEndToEndTestcase - Ensure users match when testing on
 clean environment

---
 tests/phpunit/CiviTest/CiviEndToEndTestCase.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/phpunit/CiviTest/CiviEndToEndTestCase.php b/tests/phpunit/CiviTest/CiviEndToEndTestCase.php
index 27350c3621..bc932fbbff 100644
--- a/tests/phpunit/CiviTest/CiviEndToEndTestCase.php
+++ b/tests/phpunit/CiviTest/CiviEndToEndTestCase.php
@@ -11,14 +11,15 @@
  */
 class CiviEndToEndTestCase extends PHPUnit_Framework_TestCase implements \Civi\Test\EndToEndInterface {
 
-  protected function setUp() {
+  public static function setUpBeforeClass() {
     CRM_Core_Config::singleton(1, 1);
     CRM_Utils_System::loadBootStrap(array(
       'name' => $GLOBALS['_CV']['ADMIN_USER'],
       'pass' => $GLOBALS['_CV']['ADMIN_PASS'],
     ));
+    CRM_Utils_System::synchronizeUsers();
 
-    parent::setUp();
+    parent::setUpBeforeClass();
   }
 
 }
-- 
2.25.1