diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00c57352..b51a1658 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## (unreleased)
+
+* Use freetds v1.5.1 and OpenSSL v3.5.0 for Windows and Linux builds.
+
 ## 3.2.1
 
 * Ensure the native Gem loads on Windows. Fixes #581.
diff --git a/ext/tiny_tds/extconsts.rb b/ext/tiny_tds/extconsts.rb
index d0db448a..cb874285 100644
--- a/ext/tiny_tds/extconsts.rb
+++ b/ext/tiny_tds/extconsts.rb
@@ -1,8 +1,8 @@
 ICONV_VERSION = ENV["TINYTDS_ICONV_VERSION"] || "1.18"
 ICONV_SOURCE_URI = "http://ftp.gnu.org/pub/gnu/libiconv/libiconv-#{ICONV_VERSION}.tar.gz"
 
-OPENSSL_VERSION = ENV["TINYTDS_OPENSSL_VERSION"] || "3.4.1"
+OPENSSL_VERSION = ENV["TINYTDS_OPENSSL_VERSION"] || "3.5.0"
 OPENSSL_SOURCE_URI = "https://www.openssl.org/source/openssl-#{OPENSSL_VERSION}.tar.gz"
 
-FREETDS_VERSION = ENV["TINYTDS_FREETDS_VERSION"] || "1.4.26"
+FREETDS_VERSION = ENV["TINYTDS_FREETDS_VERSION"] || "1.5.1"
 FREETDS_SOURCE_URI = "http://www.freetds.org/files/stable/freetds-#{FREETDS_VERSION}.tar.bz2"
diff --git a/test/thread_test.rb b/test/thread_test.rb
index 4fe1bad6..c66ced94 100644
--- a/test/thread_test.rb
+++ b/test/thread_test.rb
@@ -65,7 +65,7 @@ class ThreadTest < TinyTds::TestCase
           result = client.execute "waitfor delay '00:00:#{delay}'; select db_name()"
           result.each { |r| puts r }
         rescue TinyTds::Error => e
-          if e.message == "Adaptive Server connection timed out"
+          if e.message.include?("connection timed out")
             exception = true
           end
         end