diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73ce32f2d..671b37490 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -185,11 +185,9 @@ if (${WITH_UI_INDEX} EQUAL -1)
   message(FATAL_ERROR "Option ${WITH_UI} not supported for WITH_UI, valid entries are ${WITH_UI_VALUES}")
 endif()
 
-set (BUILD_ONLY_32_BIT_FOR_WIN64 FALSE)
-if ("${WITH_UI}" STREQUAL "None"
-    ## AND (${PLATFORM_ARCH} EQUAL 32)
-    AND WIN32)
-  set (BUILD_ONLY_32_BIT_FOR_WIN64 TRUE)
+set (BUILD_ONLY_32_BIT_FOR_WIN64 OFF)
+if ("${WITH_UI}" STREQUAL "None" AND WIN32)
+  set (BUILD_ONLY_32_BIT_FOR_WIN64 ON)
   message(STATUS "Building ONLY 32 bit support ")
 endif()
 
@@ -277,7 +275,11 @@ find_package(Python3 COMPONENTS Interpreter)
 #----------------------------------------------------------------------------------------------------
 # DBus
 
-option(WITH_DBUS "Enable dbus" $<NOT:$<BOOL:${BUILD_ONLY_32_BIT_FOR_WIN64}>>)
+if (BUILD_ONLY_32_BIT_FOR_WIN64)
+  option(WITH_DBUS "Enable dbus" OFF)
+else()
+  option(WITH_DBUS "Enable dbus" ON)
+endif()
 
 if (WITH_DBUS)
   include(DBus)
@@ -693,7 +695,10 @@ set(Boost_USE_SHARED_LIBS ON)
 find_package(Boost ${BOOST_MIN_VERSION} REQUIRED COMPONENTS ${BOOST_COMPONENTS})
 
 if (HAVE_TESTS)
-  set(Boost_USE_STATIC_LIBS ON)
+  if (WIN32)
+    set(Boost_USE_STATIC_LIBS ON)
+    set(Boost_USE_SHARED_LIBS OFF)
+  endif()
   find_package(Boost ${BOOST_MIN_VERSION} REQUIRED COMPONENTS test_exec_monitor)
 endif()