diff --git a/bus/dispatch.c b/bus/dispatch.c
index 1373ed70..4ac93fea 100644
--- a/bus/dispatch.c
+++ b/bus/dispatch.c
@@ -4939,6 +4939,11 @@ bus_dispatch_test_conf (const DBusString *test_data_dir,
     _dbus_test_fatal ("shell success service auto start failed");
   _dbus_test_ok ("%s:%s - check_shell_service_success_auto_start", _DBUS_FUNCTION_NAME, filename);
 
+#ifdef DBUS_WIN
+  _dbus_verbose("TODO: Fix memory leaks after running check_shell_service_success_auto_start\n");
+  _dbus_sleep_milliseconds (500);
+#endif
+
   _dbus_verbose ("Disconnecting foo, bar, and baz\n");
 
   kill_client_connection_unchecked (foo);
diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
index 6ca77675..881dfa14 100644
--- a/cmake/config.h.cmake
+++ b/cmake/config.h.cmake
@@ -234,7 +234,6 @@
 // system type defines
 #if defined(_WIN32) || defined(_WIN64) || defined (_WIN32_WCE)
 # define DBUS_WIN
-# define DBUS_WIN_FIXME 1
 # ifdef _WIN32_WCE
 #  define DBUS_WINCE
 # else
diff --git a/cmake/modules/Macros.cmake b/cmake/modules/Macros.cmake
index 63b2171b..46664ef4 100644
--- a/cmake/modules/Macros.cmake
+++ b/cmake/modules/Macros.cmake
@@ -31,7 +31,12 @@ if(DBUS_BUILD_TESTS AND CMAKE_CROSSCOMPILING AND CMAKE_SYSTEM_NAME STREQUAL "Win
 endif()
 
 macro(add_test_executable _target _source)
-    add_executable(${_target} ${_source})
+    set(_sources "${_source}")
+    if(WIN32 AND NOT MSVC)
+        # avoid triggering UAC
+        add_uac_manifest(_sources)
+    endif()
+    add_executable(${_target} ${_sources})
     target_link_libraries(${_target} ${ARGN})
     if (CMAKE_CROSSCOMPILING AND CMAKE_SYSTEM_NAME STREQUAL "Windows")
         # run tests with binfmt_misc
@@ -58,7 +63,12 @@ macro(add_test_executable _target _source)
 endmacro(add_test_executable)
 
 macro(add_helper_executable _target _source)
-    add_executable(${_target} ${_source})
+    set(_sources "${_source}")
+    if(WIN32 AND NOT MSVC)
+        # avoid triggering UAC
+        add_uac_manifest(_sources)
+    endif()
+    add_executable(${_target} ${_sources})
     target_link_libraries(${_target} ${ARGN})
 endmacro(add_helper_executable)
 
@@ -115,3 +125,23 @@ macro(generate_warning_cflags target warnings disabled_warnings error_warnings)
         message("generate_warning_cflags return: ${${target}}")
     endif()
 endmacro()
+
+#
+# Avoid triggering UAC
+#
+# This macro adds an rc file to _sources that is
+# linked to a target and prevents UAC from making
+# requests for administrator access.
+#
+macro(add_uac_manifest _sources)
+    # 1 is the resource ID, ID_MANIFEST
+    # 24 is the resource type, RT_MANIFEST
+    # constants are used because of a bug in windres
+    # see https://stackoverflow.com/questions/33000158/embed-manifest-file-to-require-administrator-execution-level-with-mingw32
+    get_filename_component(UAC_FILE ${CMAKE_SOURCE_DIR}/../tools/Win32.Manifest REALPATH)
+    set(outfile ${CMAKE_BINARY_DIR}/disable-uac.rc)
+    if(NOT EXISTS outfile)
+        file(WRITE ${outfile} "1 24 \"${UAC_FILE}\"\n")
+    endif()
+    list(APPEND ${_sources} ${outfile})
+endmacro()
diff --git a/cmake/tools/CMakeLists.txt b/cmake/tools/CMakeLists.txt
index 704e3a49..72fa6727 100644
--- a/cmake/tools/CMakeLists.txt
+++ b/cmake/tools/CMakeLists.txt
@@ -91,13 +91,7 @@ if(WIN32)
     list(APPEND dbus_update_activation_environment_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/versioninfo-${DBUS_VER_INTERNAL_NAME}.rc)
 endif()
 if(WIN32 AND NOT MSVC)
-    # avoid dbus-update-activation-environment triggering UAC
-    # 1 is the resource ID, ID_MANIFEST
-    # 24 is the resource type, RT_MANIFEST
-    # constants are used because of a bug in windres
-    # see https://stackoverflow.com/questions/33000158/embed-manifest-file-to-require-administrator-execution-level-with-mingw32
-    file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/disable-uac.rc "1 24 \"${CMAKE_SOURCE_DIR}/../tools/Win32.Manifest\"\n")
-    list(APPEND dbus_update_activation_environment_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/disable-uac.rc)
+    add_uac_manifest(dbus_update_activation_environment_SOURCES)
 endif()
 add_executable(dbus-update-activation-environment ${dbus_update_activation_environment_SOURCES})
 target_link_libraries(dbus-update-activation-environment ${DBUS_LIBRARIES})
diff --git a/dbus/dbus-memory.c b/dbus/dbus-memory.c
index c4cbd315..16c20e83 100644
--- a/dbus/dbus-memory.c
+++ b/dbus/dbus-memory.c
@@ -254,7 +254,7 @@ dbus_bool_t
 _dbus_decrement_fail_alloc_counter (void)
 {
   _dbus_initialize_malloc_debug ();
-#ifdef DBUS_WIN_FIXME
+#ifdef DBUS_WIN
   {
     static dbus_bool_t called = 0;