diff --git a/.travis.yml b/.travis.yml
index 32a0cd5d..30fa4148 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,15 +5,19 @@ language: cpp
 #  - osx
 
 compiler:
-  - gcc
+#  - gcc
   - clang
 
+env:
+#  - CGAL_VERSION=4.3
+  - CGAL_VERSION=4.7
+
 before_install:
-  - ./travis/${TRAVIS_OS_NAME}/before_install.sh
+  - ./travis/${TRAVIS_OS_NAME}/before_install.sh $CGAL_VERSION
 
 before_script:
   - cmake -DSFCGAL_BUILD_TESTS=ON
 
 script:
   - make
-  - make test
+  - ctest -VV
diff --git a/cmake/Modules/FindCGAL.cmake b/cmake/Modules/FindCGAL.cmake
index 17876b52..d61765e5 100644
--- a/cmake/Modules/FindCGAL.cmake
+++ b/cmake/Modules/FindCGAL.cmake
@@ -24,7 +24,8 @@ if( CGAL_LIBRARY )
 endif()
 
 if(CGAL_FIND_VERSION)
-    find_file(version_file CGAL/version.h HINTS $ENV{CGAL_DIR}/include ${CGAL_DIR}/include ${CGAL_INCLUDE_DIRS} PATH_SUFFIXES CGAL)
+    message("CGAL_DIR ${CGAL_DIR}")
+    find_file(version_file version.h HINTS $ENV{CGAL_DIR}/include ${CGAL_DIR}/include ${CGAL_INCLUDE_DIRS} PATH_SUFFIXES CGAL)
     file(STRINGS ${version_file} version_str REGEX "# *define +CGAL_VERSION +")
     string( REGEX REPLACE "# *define +CGAL_VERSION +" "" CGAL_VERSION ${version_str})
     if("${CGAL_VERSION}" VERSION_LESS "${CGAL_FIND_VERSION}")
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 64f80146..6a455e91 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -18,3 +18,5 @@ if( SFCGAL_BUILD_BENCH )
 	add_subdirectory( bench )
 endif()
 
+# add a custom rule "check" that adds verbosity to ctest
+add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --verbose)
diff --git a/test/garden/CMakeLists.txt b/test/garden/CMakeLists.txt
index 28674b9d..cf83e06b 100644
--- a/test/garden/CMakeLists.txt
+++ b/test/garden/CMakeLists.txt
@@ -17,9 +17,9 @@ set_target_properties( ${REGRESS_NAME} PROPERTIES DEBUG_POSTFIX "d" )
 install( TARGETS ${REGRESS_NAME} DESTINATION bin )
 
 if (CMAKE_BUILD_TYPE STREQUAL "Debug" )
-    add_test( garden-testd ${CMAKE_CURRENT_BINARY_DIR}/garden-test-SFCGALd )
+    add_test( garden-testd ${CMAKE_CURRENT_BINARY_DIR}/garden-test-SFCGALd --verbose)
 else()
-    add_test( garden-test ${CMAKE_CURRENT_BINARY_DIR}/garden-test-SFCGAL )
+    add_test( garden-test ${CMAKE_CURRENT_BINARY_DIR}/garden-test-SFCGAL --verbose)
 endif()
 
 
diff --git a/test/regress/standalone/CMakeLists.txt b/test/regress/standalone/CMakeLists.txt
index 2b0df3c4..7459e5ee 100644
--- a/test/regress/standalone/CMakeLists.txt
+++ b/test/regress/standalone/CMakeLists.txt
@@ -15,9 +15,9 @@ set_target_properties( standalone-regress-test-SFCGAL PROPERTIES DEBUG_POSTFIX "
 install( TARGETS standalone-regress-test-SFCGAL DESTINATION bin )
 
 if (CMAKE_BUILD_TYPE STREQUAL "Debug" )
-    add_test( standalone-regress-testd ${CMAKE_CURRENT_BINARY_DIR}/standalone-regress-test-SFCGALd )
+    add_test( standalone-regress-testd ${CMAKE_CURRENT_BINARY_DIR}/standalone-regress-test-SFCGALd --auto_start_dbg=y --log_level=all)
 else()
-    add_test( standalone-regress-test ${CMAKE_CURRENT_BINARY_DIR}/standalone-regress-test-SFCGAL )
+    add_test( standalone-regress-test ${CMAKE_CURRENT_BINARY_DIR}/standalone-regress-test-SFCGAL --auto_start_dbg=y --log_level=all)
 endif()
 
 
diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
index bede8bad..675c7c9a 100644
--- a/test/unit/CMakeLists.txt
+++ b/test/unit/CMakeLists.txt
@@ -23,8 +23,8 @@ set_target_properties( unit-test-SFCGAL PROPERTIES DEBUG_POSTFIX "d" )
 install( TARGETS unit-test-SFCGAL DESTINATION bin )
 
 if (CMAKE_BUILD_TYPE STREQUAL "Debug" )
-    add_test( unit-testd ${CMAKE_CURRENT_BINARY_DIR}/unit-test-SFCGALd )
+    add_test( unit-testd ${CMAKE_CURRENT_BINARY_DIR}/unit-test-SFCGALd --auto_start_dbg=y --log_level=all)
 else()
-    add_test( unit-test ${CMAKE_CURRENT_BINARY_DIR}/unit-test-SFCGAL )
+    add_test( unit-test ${CMAKE_CURRENT_BINARY_DIR}/unit-test-SFCGAL --auto_start_dbg=y --log_level=all)
 endif()
 
diff --git a/travis/linux/before_install.sh b/travis/linux/before_install.sh
index 00d52b77..26f84caa 100755
--- a/travis/linux/before_install.sh
+++ b/travis/linux/before_install.sh
@@ -1,15 +1,23 @@
 export DEBIAN_FRONTEND=noninteractive
 sudo add-apt-repository ppa:apokluda/boost1.53 --yes
+sudo add-apt-repository ppa:kalakris/cmake --yes # CMAKE 2.8.11
 sudo apt-get update -qq
 sudo apt-get install --force-yes \
     cmake libboost-chrono1.53-dev libboost-program-options1.53-dev libboost-filesystem1.53-dev libboost-timer1.53-dev \
     libboost-test1.53-dev libboost-date-time1.53-dev libboost-thread1.53-dev \
     libboost-system1.53-dev libboost-serialization1.53-dev \
-    libmpfr-dev libgmp-dev
+    libmpfr-dev libgmp-dev \
+    cmake
 #CGAL
-wget https://gforge.inria.fr/frs/download.php/file/32994/CGAL-4.3.tar.gz
-tar xzf CGAL-4.3.tar.gz
-cd CGAL-4.3 && cmake . && make && sudo make install && cd ..
+if [ "$1" = "4.3" ]; then
+    wget https://gforge.inria.fr/frs/download.php/file/32994/CGAL-4.3.tar.gz
+    tar xzf CGAL-4.3.tar.gz
+    cd CGAL-4.3 && cmake . && make && sudo make install && cd ..
+elif [ "$1" = "4.7" ]; then
+    wget https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.7/CGAL-4.7.tar.gz
+    tar xzf CGAL-4.7.tar.gz
+    cd CGAL-4.7 && cmake . && make && sudo make install && cd ..
+fi
 
 
 cmake --version
diff --git a/travis/linux/install_cgal.sh b/travis/linux/install_cgal.sh
new file mode 100644
index 00000000..92922aaa
--- /dev/null
+++ b/travis/linux/install_cgal.sh
@@ -0,0 +1,14 @@
+#CGAL
+if [ "$1" = "4.3" ]; then
+    wget https://gforge.inria.fr/frs/download.php/file/32994/CGAL-4.3.tar.gz
+    tar xzf CGAL-4.3.tar.gz
+    cd CGAL-4.3 && cmake -DCMAKE_INSTALL_PREFIX=$HOME/CGAL-4.3 . && make && make install && cd ..
+elif [ "$1" = "4.7" ]; then
+    wget https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.7/CGAL-4.7.tar.gz
+    tar xzf CGAL-4.7.tar.gz
+    cd CGAL-4.7 && cmake -DCMAKE_INSTALL_PREFIX=$HOME/CGAL-4.7 . && make && make install && cd ..
+fi
+
+
+cmake --version
+clang --version