diff --git a/auth/db/tests/db_test.php b/auth/db/tests/db_test.php
index fd6a62cb748..b17a7c0b3f2 100644
--- a/auth/db/tests/db_test.php
+++ b/auth/db/tests/db_test.php
@@ -99,6 +99,13 @@ class auth_db_testcase extends advanced_testcase {
             case 'mssql':
                 set_config('type', 'mssqlnative', 'auth_db');
                 set_config('sybasequoting', '1', 'auth_db');
+
+                // The native sqlsrv driver uses a comma as separator between host and port.
+                $dbhost = $CFG->dbhost;
+                if (!empty($dboptions['dbport'])) {
+                    $dbhost .= ',' . $dboptions['dbport'];
+                }
+                set_config('host', $dbhost, 'auth_db');
                 break;
 
             default:
diff --git a/enrol/database/tests/sync_test.php b/enrol/database/tests/sync_test.php
index 0165ba15444..09523dba0de 100644
--- a/enrol/database/tests/sync_test.php
+++ b/enrol/database/tests/sync_test.php
@@ -98,6 +98,13 @@ class enrol_database_testcase extends advanced_testcase {
             case 'mssql':
                 set_config('dbtype', 'mssqlnative', 'enrol_database');
                 set_config('dbsybasequoting', '1', 'enrol_database');
+
+                // The native sqlsrv driver uses a comma as separator between host and port.
+                $dbhost = $CFG->dbhost;
+                if (!empty($dboptions['dbport'])) {
+                    $dbhost .= ',' . $dboptions['dbport'];
+                }
+                set_config('dbhost', $dbhost, 'enrol_database');
                 break;
 
             default: