diff --git a/cef_paths2.gypi b/cef_paths2.gypi
index cdb1da6a0..df99ace52 100644
--- a/cef_paths2.gypi
+++ b/cef_paths2.gypi
@@ -563,6 +563,7 @@
       'tests/ceftests/audio_output_unittest.cc',
       'tests/ceftests/client_app_delegates.cc',
       'tests/ceftests/cookie_unittest.cc',
+      'tests/ceftests/cors_unittest.cc',
       'tests/ceftests/dom_unittest.cc',
       'tests/ceftests/frame_unittest.cc',
       'tests/ceftests/message_router_unittest.cc',
diff --git a/tests/ceftests/run_all_unittests.cc b/tests/ceftests/run_all_unittests.cc
index ba72a06ee..ede6890dc 100644
--- a/tests/ceftests/run_all_unittests.cc
+++ b/tests/ceftests/run_all_unittests.cc
@@ -169,6 +169,8 @@ int main(int argc, char* argv[]) {
   settings.no_sandbox = true;
 #endif
 
+  client::ClientAppBrowser::PopulateSettings(test_suite.command_line(),
+                                             settings);
   test_suite.GetSettings(settings);
 
 #if defined(OS_MAC)
diff --git a/tests/ceftests/test_suite.cc b/tests/ceftests/test_suite.cc
index 63aebd6a3..30ffc4ef1 100644
--- a/tests/ceftests/test_suite.cc
+++ b/tests/ceftests/test_suite.cc
@@ -7,7 +7,6 @@
 #include "include/cef_file_util.h"
 #include "include/wrapper/cef_scoped_temp_dir.h"
 #include "tests/gtest/include/gtest/gtest.h"
-#include "tests/shared/browser/client_app_browser.h"
 #include "tests/shared/common/client_switches.h"
 
 namespace {
@@ -133,8 +132,6 @@ int CefTestSuite::Run() {
 }
 
 void CefTestSuite::GetSettings(CefSettings& settings) const {
-  client::ClientAppBrowser::PopulateSettings(command_line_, settings);
-
   // Enable the experimental Chrome runtime. See issue #2969 for details.
   settings.chrome_runtime =
       command_line_->HasSwitch(client::switches::kEnableChromeRuntime);