diff --git a/web/regression/feature_utils/app_starter.py b/web/regression/feature_utils/app_starter.py
index 77b0400c9..013f757c0 100644
--- a/web/regression/feature_utils/app_starter.py
+++ b/web/regression/feature_utils/app_starter.py
@@ -41,7 +41,6 @@ class AppStarter:
             env=env
         )
 
-        self.driver.set_window_size(1280, 1024)
         self.driver.get(
             "http://" + self.app_config.DEFAULT_SERVER + ":" +
             random_server_port
diff --git a/web/regression/runtests.py b/web/regression/runtests.py
index 1de982325..a20c8f686 100644
--- a/web/regression/runtests.py
+++ b/web/regression/runtests.py
@@ -21,6 +21,7 @@ import traceback
 import json
 
 from selenium import webdriver
+from selenium.webdriver.chrome.options import Options
 
 if sys.version_info < (2, 7):
     import unittest2 as unit_test
@@ -180,7 +181,13 @@ def get_test_modules(arguments):
         exclude_pkgs += arguments['exclude'].split(',')
 
     if 'feature_tests' not in exclude_pkgs:
-        driver = webdriver.Chrome()
+        options = Options()
+        if test_setup.config_data:
+            if 'headless_chrome' in test_setup.config_data:
+                if test_setup.config_data['headless_chrome']:
+                    options.add_argument("--headless")
+        options.add_argument("--window-size=1280x1024")
+        driver = webdriver.Chrome(chrome_options=options)
         app_starter = AppStarter(driver, config)
         app_starter.start_app()
 
diff --git a/web/regression/test_config.json.in b/web/regression/test_config.json.in
index 47f849989..54eeddbbe 100644
--- a/web/regression/test_config.json.in
+++ b/web/regression/test_config.json.in
@@ -1,4 +1,5 @@
 {
+  "headless_chrome": false,
   "pgAdmin4_login_credentials": {
     "new_password": "NEWPASSWORD",
     "login_password": "PASSWORD",