diff --git a/web/config.py b/web/config.py
index 3d8f6f7..cd468f2 100644
--- a/web/config.py
+++ b/web/config.py
@@ -333,6 +333,10 @@ DEFAULT_BINARY_PATHS = {
 
 # The default path for SQLite database for testing
 TEST_SQLITE_PATH = os.path.join(DATA_DIR, 'test_pgadmin4.db')
+# The default browser to use for feature test
+# Supported browsers are 'Chrome' and 'Firefox'.
+# If specified other than this feature test runs in Chrome browser by default.
+DEFAULT_TEST_BROWSER = 'Chrome'
 
 ##########################################################################
 # Allows flask application to response to the each request asynchronously
diff --git a/web/regression/README b/web/regression/README
index 88edbd8..0974b01 100644
--- a/web/regression/README
+++ b/web/regression/README
@@ -46,7 +46,7 @@ General Information
   - 'pgAdmin4/web/pgadmin/browser/server_groups/tests/' shows an example of
      tree traversal of the pgAdmin modules and how the test folder is required
      for each individual module.
-	
+
   - 'pgadmin/browser/server_groups/servers/tests/' directory will have separate
      file for each test-case:
 
@@ -127,6 +127,12 @@ Python Tests:
   https://sites.google.com/a/chromium.org/chromedriver/downloads or a
   package manager and make sure it is in the PATH
 
+- For feature tests to run on Firefox, geckodriver need to be installed;
+  - Get geckodriver from https://github.com/mozilla/geckodriver/releases.
+  - Extract the binary and run chmod +x geckodriver.
+  - Copy geckodriver into /usr/local/bin or make sure path of the
+    geckodriver must be specified in the PATH.
+
 - The test framework is modular and pluggable and dynamically locates tests
   for modules which are discovered at runtime. All test cases are found
   and registered automatically by its module name in
diff --git a/web/regression/runtests.py b/web/regression/runtests.py
index 1de9823..f5a6340 100644
--- a/web/regression/runtests.py
+++ b/web/regression/runtests.py
@@ -180,7 +180,10 @@ def get_test_modules(arguments):
         exclude_pkgs += arguments['exclude'].split(',')
 
     if 'feature_tests' not in exclude_pkgs:
-        driver = webdriver.Chrome()
+        if config.DEFAULT_TEST_BROWSER == 'Firefox':
+            driver = webdriver.Firefox()
+        else:
+            driver = webdriver.Chrome()
         app_starter = AppStarter(driver, config)
         app_starter.start_app()