diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73434d8..fabddbb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,17 +1,10 @@
-#----------------------------------------------------------------------------
-# This file was automatically generated from the original CMakeLists.txt file
-# Add a variable to hold the headers for the library
-set (lib_headers
-    intrusive_ptr.hpp
-    intrusive
-)
 
 # Add a library target to the build system
 boost_library_project(
   intrusive
   #  SRCDIRS 
-  #  TESTDIRS 
-  HEADERS ${lib_headers}
+  TESTDIRS test
+  HEADERS intrusive_ptr.hpp intrusive
   #  DOCDIRS 
   #  DESCRIPTION 
   MODULARIZED 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
new file mode 100644
index 0000000..18326bb
--- /dev/null
+++ b/test/CMakeLists.txt
@@ -0,0 +1,23 @@
+# Boost Intrusive Library Test Jamfile
+#  (C) Copyright Ion Gaztanaga 2006.
+# Use, modification and distribution are subject to the 
+# Boost Software License, Version 1.0. (See accompanying file 
+# LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+# Adapted from John Maddock's TR1 Jamfile.v2
+# Copyright John Maddock 2005.
+# Use, modification and distribution are subject to the 
+# Boost Software License, Version 1.0. (See accompanying file 
+# LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+# this rule enumerates through all the sources and invokes
+# the run rule for each source, the result is a list of all
+# the run rules, which we can pass on to the test_suite rule:
+
+file(GLOB SRCFILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp)
+
+foreach(testfile ${SRCFILES})
+  get_filename_component(testname ${testfile} NAME_WE)
+  boost_test_run(${testname})
+endforeach()
+