diff --git a/CMakeLists.txt b/CMakeLists.txt
index eab8ef80d..d0cd4822c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -200,7 +200,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_SOURCE_DI
 
 INCLUDE(CTest)
 
-if(TEST_BUILD)
+if(BUILD_TESTING)
 	enable_testing()
 endif()
 
diff --git a/cmake/ConfigOptions.cmake b/cmake/ConfigOptions.cmake
index 66a9ccaf9..fa258a4cc 100644
--- a/cmake/ConfigOptions.cmake
+++ b/cmake/ConfigOptions.cmake
@@ -27,7 +27,7 @@ if(MSVC)
 	option(WITH_WIN8 "Use Windows 8 libraries" OFF)
 endif()
 
-option(TEST_BUILD "Build unit tests" OFF)
+option(BUILD_TESTING "Build unit tests" OFF)
 
 if(${CMAKE_VERSION} VERSION_GREATER 2.8.8)
 	option(MONOLITHIC_BUILD "Use monolithic build" OFF)
diff --git a/winpr/libwinpr/asn1/CMakeLists.txt b/winpr/libwinpr/asn1/CMakeLists.txt
index c3d50bf1a..379714d22 100644
--- a/winpr/libwinpr/asn1/CMakeLists.txt
+++ b/winpr/libwinpr/asn1/CMakeLists.txt
@@ -41,6 +41,6 @@ endif()
 
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR")
 
-if(TEST_BUILD)
+if(BUILD_TESTING)
 	add_subdirectory(test)
 endif()
diff --git a/winpr/libwinpr/crt/CMakeLists.txt b/winpr/libwinpr/crt/CMakeLists.txt
index f1831f37e..4d8a5782a 100644
--- a/winpr/libwinpr/crt/CMakeLists.txt
+++ b/winpr/libwinpr/crt/CMakeLists.txt
@@ -44,6 +44,6 @@ endif()
 
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR")
 
-if(TEST_BUILD)
+if(BUILD_TESTING)
 	add_subdirectory(test)
 endif()
diff --git a/winpr/libwinpr/file/CMakeLists.txt b/winpr/libwinpr/file/CMakeLists.txt
index a78035750..26a466a64 100644
--- a/winpr/libwinpr/file/CMakeLists.txt
+++ b/winpr/libwinpr/file/CMakeLists.txt
@@ -36,9 +36,7 @@ set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SO
 if(MONOLITHIC_BUILD)
 
 else()
-	if(NOT WIN32)
-		set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr-handle)
-	endif()
+	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr-handle)
 
 	target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 	install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
@@ -46,6 +44,6 @@ endif()
 
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR")
 
-if(TEST_BUILD)
+if(BUILD_TESTING)
 	add_subdirectory(test)
 endif()
diff --git a/winpr/libwinpr/interlocked/CMakeLists.txt b/winpr/libwinpr/interlocked/CMakeLists.txt
index e1beddeb9..508804e6e 100644
--- a/winpr/libwinpr/interlocked/CMakeLists.txt
+++ b/winpr/libwinpr/interlocked/CMakeLists.txt
@@ -42,6 +42,6 @@ endif()
 
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR")
 
-if(TEST_BUILD)
+if(BUILD_TESTING)
 	add_subdirectory(test)
 endif()
diff --git a/winpr/libwinpr/io/CMakeLists.txt b/winpr/libwinpr/io/CMakeLists.txt
index 55f809091..39794bf2f 100644
--- a/winpr/libwinpr/io/CMakeLists.txt
+++ b/winpr/libwinpr/io/CMakeLists.txt
@@ -37,6 +37,6 @@ endif()
 
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR")
 
-if(TEST_BUILD)
+if(BUILD_TESTING)
 	add_subdirectory(test)
 endif()
diff --git a/winpr/libwinpr/library/CMakeLists.txt b/winpr/libwinpr/library/CMakeLists.txt
index ac78a8156..b9b9a23ee 100644
--- a/winpr/libwinpr/library/CMakeLists.txt
+++ b/winpr/libwinpr/library/CMakeLists.txt
@@ -46,6 +46,6 @@ endif()
 
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR")
 
-if(TEST_BUILD)
+if(BUILD_TESTING)
 	add_subdirectory(test)
 endif()
diff --git a/winpr/libwinpr/path/CMakeLists.txt b/winpr/libwinpr/path/CMakeLists.txt
index fd78f3829..3d5ac2731 100644
--- a/winpr/libwinpr/path/CMakeLists.txt
+++ b/winpr/libwinpr/path/CMakeLists.txt
@@ -38,6 +38,6 @@ endif()
 
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR")
 
-if(TEST_BUILD)
+if(BUILD_TESTING)
 	add_subdirectory(test)
 endif()
diff --git a/winpr/libwinpr/pipe/CMakeLists.txt b/winpr/libwinpr/pipe/CMakeLists.txt
index b5251fbe6..1f68429da 100644
--- a/winpr/libwinpr/pipe/CMakeLists.txt
+++ b/winpr/libwinpr/pipe/CMakeLists.txt
@@ -48,6 +48,6 @@ endif()
 
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR")
 
-if(TEST_BUILD)
+if(BUILD_TESTING)
 	add_subdirectory(test)
 endif()
diff --git a/winpr/libwinpr/sspi/CMakeLists.txt b/winpr/libwinpr/sspi/CMakeLists.txt
index 6b2ed601b..b6d4b8eb9 100644
--- a/winpr/libwinpr/sspi/CMakeLists.txt
+++ b/winpr/libwinpr/sspi/CMakeLists.txt
@@ -77,14 +77,11 @@ endif()
 if(MONOLITHIC_BUILD)
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr)
 else()
-	if (NOT WIN32)
-		set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS}
-			winpr-crt
-			winpr-sysinfo
-			winpr-registry)
-	endif()
-	
-	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr-utils)
+	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS}
+		winpr-crt
+		winpr-sysinfo
+		winpr-registry
+		winpr-utils)
 endif()
 
 if(MONOLITHIC_BUILD)
@@ -96,6 +93,6 @@ endif()
 
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR")
 
-if(TEST_BUILD)
+if(BUILD_TESTING)
 	add_subdirectory(test)
 endif()
diff --git a/winpr/libwinpr/sspi/test/CMakeLists.txt b/winpr/libwinpr/sspi/test/CMakeLists.txt
index 0c774a0e5..5b8f9595d 100644
--- a/winpr/libwinpr/sspi/test/CMakeLists.txt
+++ b/winpr/libwinpr/sspi/test/CMakeLists.txt
@@ -28,3 +28,4 @@ foreach(test ${${MODULE_PREFIX}_TESTS})
 endforeach()
 
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Test")
+