diff --git a/.github/workflows/api.yaml b/.github/workflows/api.yaml
index 9b4489e4302..e995fbe14e6 100644
--- a/.github/workflows/api.yaml
+++ b/.github/workflows/api.yaml
@@ -1,7 +1,7 @@
 name: API tests
 on: [push, pull_request]
 env:
-  GALAXY_TEST_DBURI: 'postgres://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
+  GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
 jobs:
   test:
     name: Test
diff --git a/.github/workflows/api_paste.yaml b/.github/workflows/api_paste.yaml
index 1f34a6b6840..eee6922b827 100644
--- a/.github/workflows/api_paste.yaml
+++ b/.github/workflows/api_paste.yaml
@@ -1,7 +1,7 @@
 name: API (legacy paste) tests
 on: [push, pull_request]
 env:
-  GALAXY_TEST_DBURI: 'postgres://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
+  GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
   GALAXY_TEST_USE_UVICORN: false
 jobs:
   test:
diff --git a/.github/workflows/db_indexes.yaml b/.github/workflows/db_indexes.yaml
index df9b8573260..52e1dea5d83 100644
--- a/.github/workflows/db_indexes.yaml
+++ b/.github/workflows/db_indexes.yaml
@@ -38,7 +38,7 @@ jobs:
     - name: Check indexes on postgresql
       if: matrix.db == 'postgresql'
       env:
-        GALAXY_CONFIG_OVERRIDE_DATABASE_CONNECTION: 'postgres://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
+        GALAXY_CONFIG_OVERRIDE_DATABASE_CONNECTION: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
       run: tox -e check_indexes
     - name: Check indexes on sqlite
       if: matrix.db == 'sqlite'
diff --git a/.github/workflows/framework.yaml b/.github/workflows/framework.yaml
index 55aa99f6219..562c170881a 100644
--- a/.github/workflows/framework.yaml
+++ b/.github/workflows/framework.yaml
@@ -1,7 +1,7 @@
 name: Framework tests
 on: [push, pull_request]
 env:
-  GALAXY_TEST_DBURI: 'postgres://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
+  GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
 jobs:
   test:
     name: Test
diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
index 9d4d64e7718..9366868b379 100644
--- a/.github/workflows/integration.yaml
+++ b/.github/workflows/integration.yaml
@@ -1,7 +1,7 @@
 name: Integration
 on: [push, pull_request]
 env:
-  GALAXY_TEST_DBURI: 'postgres://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
+  GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
   GALAXY_TEST_AMQP_URL: 'amqp://localhost:5672//'
 jobs:
   test:
diff --git a/.github/workflows/integration_selenium.yaml b/.github/workflows/integration_selenium.yaml
index 0bfe9859ea4..08ed56f876e 100644
--- a/.github/workflows/integration_selenium.yaml
+++ b/.github/workflows/integration_selenium.yaml
@@ -1,7 +1,7 @@
 name: Integration Selenium
 on: [push, pull_request]
 env:
-  GALAXY_TEST_DBURI: 'postgres://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
+  GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
   GALAXY_TEST_SELENIUM_REMOTE: '1'
   GALAXY_TEST_SELENIUM_REMOTE_PORT: "4444"
   GALAXY_SKIP_CLIENT_BUILD: '0'
diff --git a/.github/workflows/performance.yaml b/.github/workflows/performance.yaml
index 2d045fdced1..4e6c321cc20 100644
--- a/.github/workflows/performance.yaml
+++ b/.github/workflows/performance.yaml
@@ -1,7 +1,7 @@
 name: Performance tests
 on: [push, pull_request]
 env:
-  GALAXY_TEST_DBURI: 'postgres://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
+  GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
 jobs:
   test:
     name: Test
diff --git a/.github/workflows/selenium.yaml b/.github/workflows/selenium.yaml
index a6bb3ed340f..14111ef941f 100644
--- a/.github/workflows/selenium.yaml
+++ b/.github/workflows/selenium.yaml
@@ -1,7 +1,7 @@
 name: Selenium tests
 on: [push, pull_request]
 env:
-  GALAXY_TEST_DBURI: 'postgres://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
+  GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
   GALAXY_TEST_SKIP_FLAKEY_TESTS_ON_ERROR: 'true'
   GALAXY_TEST_SELENIUM_RETRIES: 1
 jobs:
diff --git a/.github/workflows/toolshed.yaml b/.github/workflows/toolshed.yaml
index 5d260077cc3..be209770cd8 100644
--- a/.github/workflows/toolshed.yaml
+++ b/.github/workflows/toolshed.yaml
@@ -1,8 +1,8 @@
 name: Toolshed tests
 on: [push, pull_request]
 env:
-  GALAXY_TEST_DBURI: 'postgres://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
-  TOOL_SHED_TEST_DBURI: 'postgres://postgres:postgres@localhost:5432/toolshed?client_encoding=utf8'
+  GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
+  TOOL_SHED_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/toolshed?client_encoding=utf8'
 jobs:
   test:
     name: Test
diff --git a/test/unit/config/config_manage/1607_root_samples/config/reports.ini b/test/unit/config/config_manage/1607_root_samples/config/reports.ini
index 8a3a3dd8d90..4060a1223de 100644
--- a/test/unit/config/config_manage/1607_root_samples/config/reports.ini
+++ b/test/unit/config/config_manage/1607_root_samples/config/reports.ini
@@ -44,7 +44,7 @@ log_level = DEBUG
 # Database connection
 # Galaxy reports are intended for production Galaxy instances, so sqlite is not supported.
 # You may use a SQLAlchemy connection string to specify an external database.
-#database_connection = postgres:///galaxy_test?user=postgres&password=postgres
+#database_connection = postgresql:///galaxy_test?user=postgres&password=postgres
 
 # Where dataset files are saved
 #file_path = database/files
@@ -91,4 +91,4 @@ session_secret = changethisinproduction
 # static_style_dir = %(here)s/static/june_2007_style/blue
 
 # Sentry (getsentry.com) DSN for catching bugs.
-#sentry_dsn = None
\ No newline at end of file
+#sentry_dsn = None