diff --git a/pom.xml b/pom.xml
index 80cb95e..f19b71f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,13 +30,9 @@
       <version>8.0.30</version>
     </dependency>
     <dependency>
-      <!-- TODO: Bumping this to 11.2.1.jre11 causes the MSSQL tests to 
-        fail. No error message was given, but it looks like it's a time out
-        issue. There's something in the major version updates that's breaking.
-        We need to investigate what that is. -->
       <groupId>com.microsoft.sqlserver</groupId>
       <artifactId>mssql-jdbc</artifactId>
-      <version>9.4.1.jre11</version>
+      <version>12.2.0.jre11</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/test/docker-compose.yml b/test/docker-compose.yml
index fbacdec..a695657 100644
--- a/test/docker-compose.yml
+++ b/test/docker-compose.yml
@@ -10,7 +10,7 @@ services:
       DB_PASSWORD: yourStrong()Password
 
   postgres:
-    image: postgres:9.6
+    image: postgres:15.2-alpine
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U postgres"]
       timeout: 10s
@@ -20,7 +20,7 @@ services:
       POSTGRES_PASSWORD: yourStrong()Password
 
   mysql:
-    image: mysql/mysql-server:5.7
+    image: mysql/mysql-server:8.0
     healthcheck:
       test: ["CMD-SHELL", "mysqladmin ping"]
       timeout: 10s
@@ -32,7 +32,7 @@ services:
       MYSQL_PASSWORD: yourStrong()Password
 
   mssql:
-    image: mcr.microsoft.com/mssql/server:2017-latest
+    image: mcr.microsoft.com/mssql/server:2022-latest
     healthcheck:
       test: ["CMD-SHELL", "mssql-health-check"]
       timeout: 10s
diff --git a/test/test b/test/test
index a4a738a..4da8f97 100755
--- a/test/test
+++ b/test/test
@@ -18,7 +18,7 @@ mysql)  export DB_PLATFORM=mysql
         export DB_USERNAME=mysql
         ;;
 mssql)  export DB_PLATFORM=mssql
-        export DB_URL=sqlserver://mssql:1433;databaseName=tempdb
+        export DB_URL=sqlserver://mssql:1433;databaseName=tempdb;encrypt=false;trustServerCertificate=true
         export DB_USERNAME=sa
         ;;
 *) echo "DATABASE_TYPE $1 is not supported"