diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml
index 9c8f2fea..8185a207 100644
--- a/.github/workflows/test-suite.yml
+++ b/.github/workflows/test-suite.yml
@@ -11,6 +11,8 @@ jobs:
   tests:
     name: "Python ${{ matrix.python-version }}"
     runs-on: "ubuntu-latest"
+    env:
+      MSSQL_SA_PASSWORD: Mssql123$#mssql
 
     strategy:
       matrix:
@@ -41,7 +43,7 @@ jobs:
       mssql:
         image: mcr.microsoft.com/mssql/server:2019-GA-ubuntu-16.04
         env:
-          MSSQL_SA_PASSWORD: "Mssql123$#mssql"
+          MSSQL_SA_PASSWORD: ${{ env.MSSQL_SA_PASSWORD }}
           ACCEPT_EULA: "Y"
           MSSQL_PID: Express
         ports:
diff --git a/databases/backends/mssql.py b/databases/backends/mssql.py
index d9820c15..a6ad80ca 100644
--- a/databases/backends/mssql.py
+++ b/databases/backends/mssql.py
@@ -78,7 +78,7 @@ async def connect(self) -> None:
         user = self._database_url.username or getpass.getuser()
         password = self._database_url.password
 
-        dsn = f"Driver={driver};Database={database};Server={hostname};UID={user};PWD={password};Port={port}"
+        dsn = f"Driver={driver};Database={database};Server={hostname},{port};UID={user};PWD={password};"
 
         self._pool = await aioodbc.create_pool(
             dsn=dsn,