diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt
index 53e6d734e4d..09decb19645 100644
--- a/Installation/CMakeLists.txt
+++ b/Installation/CMakeLists.txt
@@ -49,6 +49,7 @@ if (NOT CGAL_DATA_DIR)
       if (EXISTS "${CMAKE_SOURCE_DIR}/Data/data")
         set(CGAL_DATA_DIR "${CMAKE_SOURCE_DIR}/Data/data")
       else()
+        message("CMAKE_SOURCE_DIR = ${CMAKE_SOURCE_DIR}")
         message(FATAL_ERROR "CGAL_DATA_DIR cannot be deduced, please set the variable CGAL_DATA_DIR")
       endif()
     endif()
diff --git a/Scripts/developer_scripts/create_cgal_test b/Scripts/developer_scripts/create_cgal_test
index 6b1c7e19ded..393e974fde7 100755
--- a/Scripts/developer_scripts/create_cgal_test
+++ b/Scripts/developer_scripts/create_cgal_test
@@ -100,10 +100,10 @@ compile_and_run()
 
   if [ -z "\${CGAL_DATA_DIR}" ]; then
     if [ -d ../../data ]; then
-      CGAL_DATA_DIR=../../data
+      export CGAL_DATA_DIR=../../data
     else
       if [ -d ../../../Data/data ]; then
-        CGAL_DATA_DIR=../../../Data/data
+        export CGAL_DATA_DIR=../../../Data/data
       else
         echo "ERROR: Cannot run test script, please set the variable CGAL_DATA_DIR"
         exit 1