diff --git a/Circular_kernel_2/test/Circular_kernel_2/CMakeLists.txt b/Circular_kernel_2/test/Circular_kernel_2/CMakeLists.txt
new file mode 100644
index 00000000000..e3a56c776c1
--- /dev/null
+++ b/Circular_kernel_2/test/Circular_kernel_2/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Created by the script cgal_create_cmake_script
+# This is the CMake script for compiling a CGAL application.
+
+
+project( Circular_kernel_2_example )
+
+CMAKE_MINIMUM_REQUIRED(VERSION 2.4.5)
+
+set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
+ 
+find_package(CGAL QUIET COMPONENTS Core )
+
+if ( CGAL_FOUND )
+
+  include( ${CGAL_USE_FILE} )
+
+  include( CreateSingleSourceCGALProgram )
+
+include_directories (BEFORE include)
+include_directories (BEFORE ../../include)
+include_directories (BEFORE ../../../Kernel_23/test/Kernel_23/include)
+include_directories (BEFORE ../Kernel_23/include)
+
+create_single_source_cgal_program( "test_Circular_kernel.cpp" )
+create_single_source_cgal_program( "test_Exact_circular_kernel.cpp" )
+create_single_source_cgal_program( "test_Filtered_bbox_circular_kernel.cpp" )
+create_single_source_cgal_program( "test_Line_arc.cpp" )
+
+else()
+  
+    message(STATUS "This program requires the CGAL library, and will not be compiled.")
+  
+endif()
+
diff --git a/Circular_kernel_2/test/Circular_kernel_2/GNUmakefile b/Circular_kernel_2/test/Circular_kernel_2/GNUmakefile
index 2aee73ada85..24f58e40a44 100644
--- a/Circular_kernel_2/test/Circular_kernel_2/GNUmakefile
+++ b/Circular_kernel_2/test/Circular_kernel_2/GNUmakefile
@@ -20,6 +20,8 @@ CXXFLAGS = \
            -I../../../Intersections_2/include \
            -I../../include \
            -Iinclude\
+           -I../../../Kernel_23/test/Kernel_23/include \
+           -I../Kernel_23/include \
            -g\
 	   $(TESTSUITE_CXXFLAGS) \
            $(EXTRA_FLAGS) \
@@ -67,9 +69,3 @@ clean: \
 		   test_Filtered_bbox_circular_kernel.clean\
                    test_Line_arc.clean 
 
-#---------------------------------------------------------------------#
-#                    suffix rules
-#---------------------------------------------------------------------#
-
-.cpp$(OBJ_EXT):
-	$(CGAL_CXX) $(CXXFLAGS) $(OBJ_OPT) $<