diff --git a/CMakeLists.txt b/CMakeLists.txt
index c98caf58..b9c9f014 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -306,8 +306,9 @@ if (NOT
     (HAVE_STRLCPY AND HAVE_DECL_STRLCPY AND
      HAVE_ARC4RANDOM AND HAVE_DECL_ARC4RANDOM AND
      HAVE_ARC4RANDOM_UNIFORM AND HAVE_DECL_ARC4RANDOM_UNIFORM))
- find_library(BSD_LIB bsd)
- if (BSD_LIB)
+ find_library(BSD_LIBRARY bsd)
+ if (BSD_LIBRARY)
+   mark_as_advanced(BSD_LIBRARY)
    list(APPEND getdns_system_libs "bsd")
    set(CMAKE_REQUIRED_LIBRARIES "bsd")
 
diff --git a/cmake/modules/FindCheck.cmake b/cmake/modules/FindCheck.cmake
index 6fda8c95..73bf9e61 100644
--- a/cmake/modules/FindCheck.cmake
+++ b/cmake/modules/FindCheck.cmake
@@ -97,4 +97,5 @@ find_package_handle_standard_args(Check
   VERSION_VAR CHECK_VERSION
   )
 
-mark_as_advanced(CHECK_INCLUDE_DIR CHECK_LIBRARIES)
+mark_as_advanced(CHECK_INCLUDE_DIR CHECK_LIBRARIES CHECK_LIBRARY
+  CHECK_MATH_LIBRARY CHECK_RT_LIBRARY CHECK_SUBUNIT_LIBRARY)