diff --git a/CMakeLists.txt b/CMakeLists.txt
index 303d75fc50..c82ae3c820 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,7 +58,7 @@ include(GNUInstallDirs)
 # Include some common macros to simpilfy the Poco CMake files
 include(PocoMacros)
 
-option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
+option(BUILD_SHARED_LIBS "Build shared libraries" ON)
 
 set(POCO_SANITIZEFLAGS CACHE STRING "Compiler-dependent sanitizer flags (like -fsanitize=address or /fsanitize=address")
 
diff --git a/Foundation/testsuite/CMakeLists.txt b/Foundation/testsuite/CMakeLists.txt
index 25429709d2..389f6137b4 100644
--- a/Foundation/testsuite/CMakeLists.txt
+++ b/Foundation/testsuite/CMakeLists.txt
@@ -59,7 +59,13 @@ target_link_libraries(TestApp PUBLIC Poco::Foundation)
 
 # TestLibrary
 add_library(TestLibrary SHARED src/TestLibrary.cpp src/TestPlugin.cpp src/TestPlugin.h)
-set_target_properties(TestLibrary PROPERTIES PREFIX "" DEBUG_POSTFIX "d") # The test requires the library named TestLibrary. By default it is prefixed with lib.
+set_target_properties(TestLibrary PROPERTIES DEBUG_POSTFIX "d")
+set_target_properties(TestLibrary PROPERTIES RELEASE_POSTFIX "")
+set_target_properties(TestLibrary PROPERTIES CMAKE_MINSIZEREL_POSTFIX "")
+set_target_properties(TestLibrary PROPERTIES CMAKE_RELWITHDEBINFO_POSTFIX "")
+# The test requires the library named TestLibrary. By default it is prefixed with lib.
+set_target_properties(TestLibrary PROPERTIES PREFIX "")
+
 # The test is run in the runtime directory. So the TestLibrary is built there too because it is used by the tests
 set_target_properties(TestLibrary PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 target_link_libraries(TestLibrary PUBLIC Poco::Foundation)
diff --git a/cmake/DefinePlatformSpecific.cmake b/cmake/DefinePlatformSpecific.cmake
index 7d7e51e3cd..b8d864cc19 100644
--- a/cmake/DefinePlatformSpecific.cmake
+++ b/cmake/DefinePlatformSpecific.cmake
@@ -38,6 +38,8 @@ if(MSVC)
 		set(STATIC_POSTFIX "md" CACHE STRING "Set static library postfix" FORCE)
 	endif(POCO_MT)
 
+	message(STATUS "MSVC runtime library: ${CMAKE_MSVC_RUNTIME_LIBRARY}")
+
 	if(POCO_SANITIZE_ASAN)
 		message(WARNING "Use POCO_SANITIZEFLAGS instead of POCO_SANITIZE_ASAN")
 		add_compile_options("/fsanitize=address")