diff --git a/solr-admin-app/tests/conftest.py b/solr-admin-app/tests/conftest.py
index 09bd1f9fd..98d59efa6 100644
--- a/solr-admin-app/tests/conftest.py
+++ b/solr-admin-app/tests/conftest.py
@@ -4,6 +4,7 @@
 import pytest
 from selenium.webdriver.firefox.webdriver import WebDriver
 from selenium.webdriver.firefox.options import Options
+from selenium.webdriver.firefox.service import Service
 from sqlalchemy import engine_from_config
 from tests.external.support.driver.server_driver import ServerDriver
 
@@ -25,7 +26,8 @@ def get_browser():
 
     options = Options()
     options.headless = True
-    browser = WebDriver(options=options, executable_path=(gecko_driver()))
+    service = Service(executable_path=gecko_driver())
+    browser = WebDriver(options=options, service=service)
 
     return browser
 
@@ -81,8 +83,8 @@ def base_url(port):
 
 @pytest.fixture(scope="function")
 def clean_db():
-    from flask_sqlalchemy import SQLAlchemy
     from solr_admin import create_application
+    from solr_admin import models
 
     from solr_admin.models.synonym import Synonym
     from solr_admin.models.synonym_audit import SynonymAudit
@@ -103,7 +105,8 @@ def clean_db():
     Keycloak._oidc = FakeOidc()
     app, admin = create_application(run_mode='testing')
 
-    db = SQLAlchemy(app)
+    # Use the existing db instance that was initialized in create_application
+    db = models.db
 
     synonyms_db = engine_from_config({'sqlalchemy.url': app.config['SQLALCHEMY_BINDS']['synonyms']})
     #Synonym.metadata.drop_all(bind=synonyms_db)
diff --git a/solr-admin-app/tests/external/test_not_authorized_user.py b/solr-admin-app/tests/external/test_not_authorized_user.py
index 3ae87e83c..80fc482a8 100644
--- a/solr-admin-app/tests/external/test_not_authorized_user.py
+++ b/solr-admin-app/tests/external/test_not_authorized_user.py
@@ -2,6 +2,7 @@
 from hamcrest import *
 from selenium.webdriver.firefox.webdriver import WebDriver
 from selenium.webdriver.firefox.options import Options
+from selenium.webdriver.firefox.service import Service
 
 from tests.conftest import get_browser, connect_with, gecko_driver
 import os
@@ -35,7 +36,8 @@ def new_browser(new_server, second_base_url):
 def get_browser():
     options = Options()
     options.headless = True
-    browser = WebDriver(options=options, executable_path=(gecko_driver()))
+    service = Service(executable_path=gecko_driver())
+    browser = WebDriver(options=options, service=service)
 
     return browser
 
diff --git a/solr-admin-app/tests/internal/services/test_stem.py b/solr-admin-app/tests/internal/services/test_stem.py
index 468c00132..d435536a3 100644
--- a/solr-admin-app/tests/internal/services/test_stem.py
+++ b/solr-admin-app/tests/internal/services/test_stem.py
@@ -1,4 +1,5 @@
 import os
+import pytest
 
 from hamcrest import *
 from solr_admin.services.get_stems import get_stems, get_stems_url