diff --git a/config/environment/test.php b/config/environment/test.php
index 205945db674eb53056b9d192224e1e5e7945e590..691a10f449f942ab0b49f451c16dcbeb6791c63f 100644
--- a/config/environment/test.php
+++ b/config/environment/test.php
@@ -42,7 +42,7 @@ return array(
 
         array('Access.createAccessSingleton', function ($access) {
             $testingEnvironment = new TestingEnvironment();
-            if (!$testingEnvironment->testUseRegularAuth) {
+            if ($testingEnvironment->testUseMockAuth) {
                 $access = new Piwik_MockAccess($access);
                 \Piwik\Access::setSingletonInstance($access);
             }
diff --git a/tests/UI/specs/Installation_spec.js b/tests/UI/specs/Installation_spec.js
index d1fd55057fa0844a169f3070acaafaf88e26869a..c3681dca65da76b43bf2ea9d8f53b90ce3b5d43f 100644
--- a/tests/UI/specs/Installation_spec.js
+++ b/tests/UI/specs/Installation_spec.js
@@ -14,7 +14,7 @@ describe("Installation", function () {
     this.fixture = null;
 
     before(function () {
-        testEnvironment.testUseRegularAuth = 1;
+        testEnvironment.testUseMockAuth = 0;
         testEnvironment.configFileLocal = path.join(PIWIK_INCLUDE_PATH, "/tmp/test.config.ini.php");
         testEnvironment.dontUseTestConfig = true;
         testEnvironment.tablesPrefix = 'piwik_';
@@ -29,7 +29,7 @@ describe("Installation", function () {
         delete testEnvironment.configFileLocal;
         delete testEnvironment.dontUseTestConfig;
         delete testEnvironment.tablesPrefix;
-        delete testEnvironment.testUseRegularAuth;
+        delete testEnvironment.testUseMockAuth;
         testEnvironment.save();
     });
 
diff --git a/tests/UI/specs/Login_spec.js b/tests/UI/specs/Login_spec.js
index bb8372e601f290d183b9fd88080b0657f9d3f775..81e137fbc2fd386e7b994dcbacf7be619f70c6cc 100644
--- a/tests/UI/specs/Login_spec.js
+++ b/tests/UI/specs/Login_spec.js
@@ -14,13 +14,13 @@ describe("Login", function () {
         formlessLoginUrl = "?module=Login&action=logme&login=oliverqueen&password=" + md5Pass;
 
     before(function () {
-        testEnvironment.testUseRegularAuth = 1;
+        testEnvironment.testUseMockAuth = 0;
         testEnvironment.queryParamOverride = {date: "2012-01-01", period: "year"};
         testEnvironment.save();
     });
 
     after(function () {
-        testEnvironment.testUseRegularAuth = 0;
+        testEnvironment.testUseMockAuth = 1;
         delete testEnvironment.queryParamOverride;
         testEnvironment.save();
     });
diff --git a/tests/UI/specs/Overlay_spec.js b/tests/UI/specs/Overlay_spec.js
index 40546c22101877b4ecaea1c07097a22969054fdc..63b71053665ba1aaffad0f369fe6367a5ff14452 100644
--- a/tests/UI/specs/Overlay_spec.js
+++ b/tests/UI/specs/Overlay_spec.js
@@ -1,4 +1,4 @@
-/*!
+    /*!
  * Piwik - free/libre analytics platform
  *
  * Overlay screenshot tests.
diff --git a/tests/UI/specs/UIIntegration_spec.js b/tests/UI/specs/UIIntegration_spec.js
index ad497ad8499015b6b2787493aa95985dafc7be42..f307e06f7e5a1286e2332965d47e8276f6be1cbb 100644
--- a/tests/UI/specs/UIIntegration_spec.js
+++ b/tests/UI/specs/UIIntegration_spec.js
@@ -31,13 +31,13 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik?
 
     beforeEach(function () {
         delete testEnvironment.configOverride;
-        testEnvironment.testUseRegularAuth = 0;
+        testEnvironment.testUseMockAuth = 1;
         testEnvironment.save();
     });
 
     after(function () {
         delete testEnvironment.queryParamOverride;
-        testEnvironment.testUseRegularAuth = 0;
+        testEnvironment.testUseMockAuth = 1;
         testEnvironment.save();
     });
 
@@ -593,7 +593,7 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik?
     // opt out page
     it('should load the opt out page correctly', function (done) {
         expect.screenshot('opt_out').to.be.capture(function (page) {
-            testEnvironment.testUseRegularAuth = 1;
+            testEnvironment.testUseMockAuth = 0;
             testEnvironment.save();
 
             page.load("?module=CoreAdminHome&action=optOut&language=en");
diff --git a/tests/lib/screenshot-testing/support/test-environment.js b/tests/lib/screenshot-testing/support/test-environment.js
index 2753db3cbe3eb7fde5930edb6dc435c168aef17f..41d86cb19b143558a0df42ef91c32dae6b60315b 100644
--- a/tests/lib/screenshot-testing/support/test-environment.js
+++ b/tests/lib/screenshot-testing/support/test-environment.js
@@ -22,6 +22,7 @@ TestingEnvironment.prototype.reload = function () {
     this['useOverrideCss'] = true;
     this['useOverrideJs'] = true;
     this['loadRealTranslations'] = true; // UI tests should test w/ real translations, not translation keys
+    this['testUseMockAuth'] = true;
 
     if (fs.exists(testingEnvironmentOverridePath)) {
         var data = JSON.parse(fs.read(testingEnvironmentOverridePath));