diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt
index 1b396f94a9a..161b8b394ad 100644
--- a/Installation/CMakeLists.txt
+++ b/Installation/CMakeLists.txt
@@ -871,6 +871,8 @@ if(NOT CGAL_HEADER_ONLY)
 else()
   configure_file("${CGAL_MODULES_DIR}/CGALConfig_binary_header_only.cmake.in"
     "${CMAKE_BINARY_DIR}/CGALConfig.cmake"  @ONLY)
+  configure_file("${CGAL_MODULES_DIR}/CGALConfigVersion_binary_header_only.cmake.in"
+    "${CMAKE_BINARY_DIR}/CGALConfigVersion.cmake"  @ONLY)
 endif()
 
 #--------------------------------------------------------------------------------------------------
diff --git a/Installation/cmake/modules/CGALConfigVersion_binary_header_only.cmake.in b/Installation/cmake/modules/CGALConfigVersion_binary_header_only.cmake.in
new file mode 100644
index 00000000000..9b30fbcad5f
--- /dev/null
+++ b/Installation/cmake/modules/CGALConfigVersion_binary_header_only.cmake.in
@@ -0,0 +1,5 @@
+# 
+# This file points to the CGALConfigVersion.cmake for header-only CGAL.
+#
+
+include(@CGAL_INSTALLATION_PACKAGE_DIR@/lib/cmake/CGAL/CGALConfigVersion.cmake)
diff --git a/Installation/cmake/modules/CGAL_add_test.cmake b/Installation/cmake/modules/CGAL_add_test.cmake
index a2c565aeb9b..eb80d4b4695 100644
--- a/Installation/cmake/modules/CGAL_add_test.cmake
+++ b/Installation/cmake/modules/CGAL_add_test.cmake
@@ -104,12 +104,10 @@ function(cgal_add_compilation_test exe_name)
   if(NOT TARGET cgal_check_build_system)
     add_custom_target(cgal_check_build_system)
     add_dependencies( ALL_CGAL_TARGETS cgal_check_build_system )
-  endif()
-  if(NOT TEST check_build_system)
     add_test(NAME "check_build_system"
       COMMAND "${CMAKE_COMMAND}" --build "${CMAKE_BINARY_DIR}" --target "cgal_check_build_system" --config "$<CONFIG>")
     set_property(TEST "check_build_system"
-      APPEND PROPERTY LABELS "Installation")
+      APPEND PROPERTY LABELS "${PROJECT_NAME}")
     if(POLICY CMP0066) # cmake 3.7 or later
       set_property(TEST "check_build_system"
         PROPERTY FIXTURES_SETUP "check_build_system_SetupFixture")