diff --git a/.github/actions/build-test/windows/action.yml b/.github/actions/build-test/windows/action.yml
index 1acf23cce..4f2e71794 100644
--- a/.github/actions/build-test/windows/action.yml
+++ b/.github/actions/build-test/windows/action.yml
@@ -90,12 +90,15 @@ runs:
         tar xzf ${{ inputs.BOOST_ARCHIVE_NAME }}
         rm ${{ inputs.BOOST_ARCHIVE_NAME }}
         cd ${{ inputs.BOOST_FOLDER_NAME }}
-        .\bootstrap.bat
+        $vcvars = Get-ChildItem "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" -ErrorAction SilentlyContinue
+        if (-not $vcvars) { $vcvars = Get-ChildItem "C:\Program Files\Microsoft Visual Studio" -Recurse -Filter "vcvarsall.bat" | Select-Object -First 1 }
+        cmd /c "`"$($vcvars.FullName)`" x64 > nul 2>&1 && set" | ForEach-Object { if ($_ -match "^(.*?)=(.*)$") { [Environment]::SetEnvironmentVariable($matches[1], $matches[2]) } }
+        .\bootstrap.bat msvc
         # Build the libs for:
         # - Thread - https://www.boost.org/libs/thread/
         # - Chrono - https://www.boost.org/libs/chrono/
         # - Atomic - https://www.boost.org/libs/atomic/
-        .\b2 address-model=${{ inputs.ARCH_ADDRESS_MODEL }} --with-thread --with-chrono --with-atomic install
+        .\b2 address-model=${{ inputs.ARCH_ADDRESS_MODEL }} toolset=msvc --with-thread --with-chrono --with-atomic install        
         cd ..
         Remove-Item ${{ inputs.BOOST_FOLDER_NAME }} -Recurse -Force
 
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
index 01eda4dff..34ed82b8f 100644
--- a/.github/workflows/build-pr.yml
+++ b/.github/workflows/build-pr.yml
@@ -216,7 +216,6 @@ jobs:
           token: ${{ secrets.GH_TOKEN }}
 
       - uses: ./.github/actions/build-test/windows
-        if: ${{ matrix.with_openssl.toggle == 'ON' }}
         with:
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
           BOOST_VERSION: ${{ env.boost_version }}
diff --git a/.github/workflows/nightly-windows.yml b/.github/workflows/nightly-windows.yml
index 7fc4e5c80..1bff4cb5e 100644
--- a/.github/workflows/nightly-windows.yml
+++ b/.github/workflows/nightly-windows.yml
@@ -20,12 +20,12 @@ jobs:
       fail-fast: false
       matrix:
         vc_boost:
-          - name: msvc-latest_boost_1730
+          - name: msvc-latest_boost_1800
             image: 'windows-latest'
-            boost_url: 'https://archives.boost.io/release/1.73.0/source/boost_1_73_0.tar.gz'
-            boost_archive_name: 'boost_1_73_0.tar.gz'
-            boost_folder_name: 'boost_1_73_0'
-            boost_include_folder: 'C:\Boost\include\boost-1_73'
+            boost_url: 'https://archives.boost.io/release/1.80.0/source/boost_1_80_0.tar.gz'
+            boost_archive_name: 'boost_1_80_0.tar.gz'
+            boost_folder_name: 'boost_1_80_0'
+            boost_include_folder: 'C:\Boost\include\boost-1_80'
           - name: msvc-latest_boost_1890
             image: 'windows-latest'
             boost_url: 'https://archives.boost.io/release/1.89.0/source/boost_1_89_0.tar.gz'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c13d38de..f1dd75fae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -267,8 +267,6 @@ install(
 
 if (BUILD_TESTS)
     add_subdirectory(hazelcast/test)
-else()
-    message(STATUS "BUILD_TESTS is disabled.")
 endif()
 
 if (BUILD_EXAMPLES)
@@ -279,12 +277,12 @@ message(STATUS "Configuration summary:")
 if (NOT is_multi_config)
     message(STATUS "  CMAKE_BUILD_TYPE =      ${CMAKE_BUILD_TYPE}")
 endif()
-message(STATUS "  BUILD_SHARED_LIBS =     ${BUILD_SHARED_LIBS}")
-message(STATUS "  WITH_OPENSSL =          ${WITH_OPENSSL}")
-message(STATUS "  DISABLE_LOGGING =       ${DISABLE_LOGGING}")
-message(STATUS "  CMAKE_INSTALL_PREFIX =  ${CMAKE_INSTALL_PREFIX}")
-message(STATUS "  BUILD_TESTS =           ${BUILD_TESTS}")
-message(STATUS "  BUILD_EXAMPLES =        ${BUILD_EXAMPLES}")
-message(STATUS "  CMAKE_CXX_FLAGS =       ${CMAKE_CXX_FLAGS}")
-message(STATUS "  CMAKE_CXX_FLAGS_DEBUG =       ${CMAKE_CXX_FLAGS_DEBUG}")
-message(STATUS "  CMAKE_CXX_FLAGS_RELEASE =       ${CMAKE_CXX_FLAGS_RELEASE}")
+message(STATUS "  BUILD_SHARED_LIBS       = ${BUILD_SHARED_LIBS}")
+message(STATUS "  WITH_OPENSSL            = ${WITH_OPENSSL}")
+message(STATUS "  DISABLE_LOGGING         = ${DISABLE_LOGGING}")
+message(STATUS "  CMAKE_INSTALL_PREFIX    = ${CMAKE_INSTALL_PREFIX}")
+message(STATUS "  BUILD_TESTS             = ${BUILD_TESTS}")
+message(STATUS "  BUILD_EXAMPLES          = ${BUILD_EXAMPLES}")
+message(STATUS "  CMAKE_CXX_FLAGS         = ${CMAKE_CXX_FLAGS}")
+message(STATUS "  CMAKE_CXX_FLAGS_DEBUG   = ${CMAKE_CXX_FLAGS_DEBUG}")
+message(STATUS "  CMAKE_CXX_FLAGS_RELEASE = ${CMAKE_CXX_FLAGS_RELEASE}")
diff --git a/hazelcast/test/src/ClientTest.cpp b/hazelcast/test/src/ClientTest.cpp
index 550658486..f3783363f 100644
--- a/hazelcast/test/src/ClientTest.cpp
+++ b/hazelcast/test/src/ClientTest.cpp
@@ -13,9 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-#include "ClientTest.h"
-
 #include <chrono>
 #include <thread>
 
@@ -29,6 +26,8 @@
 #include "remote_controller_client.h"
 #include "TestHelperFunctions.h"
 
+#include "ClientTest.h"
+
 namespace hazelcast {
 namespace client {
 namespace test {