diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 699f3420..37dae7cd 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -164,6 +164,9 @@ jobs:
     - name: Prepare for testing (macOS)
       if: runner.os == 'macOS'
       run: |
+        cd $(brew --prefix)/Homebrew/Library/Taps/homebrew/homebrew-services
+        git reset --hard 5f2fe01
+        cd ~
         brew tap homebrew/services;
         brew services restart postgresql;
         brew services start mariadb;
diff --git a/lib/tests/CMakeLists.txt b/lib/tests/CMakeLists.txt
index 3b665bf8..9eeda26b 100644
--- a/lib/tests/CMakeLists.txt
+++ b/lib/tests/CMakeLists.txt
@@ -14,6 +14,7 @@ set(UNITTEST_SOURCES unittests/main.cc
                         unittests/PubSubServiceUnittest.cc
                         unittests/Sha1Test.cc
                         ../src/ssl_funcs/Sha1.cc
+                        ../src/HttpUtils.cc
                         unittests/FileTypeTest.cc
                         unittests/DrObjectTest.cc
                         unittests/HttpFullDateTest.cc
diff --git a/trantor b/trantor
index a7150a16..fa65b9a1 160000
--- a/trantor
+++ b/trantor
@@ -1 +1 @@
-Subproject commit a7150a1607d20c44eea175d17b874f8f14a39efb
+Subproject commit fa65b9a1e28f2ff839378a70215026ea359be500