diff --git a/CMakeLists.txt b/CMakeLists.txt
index 20891f58..59196994 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ set (lib_headers
 boost_library_project(
   unordered
   #  SRCDIRS 
-  #  TESTDIRS 
+  TESTDIRS test
   HEADERS ${lib_headers}
   #  DOCDIRS 
   #  DESCRIPTION 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e164a7bf..51973cb0 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -12,64 +12,7 @@ ENDIF( ${CMAKE_CXX_COMPILER} MATCHES "icpc" )
 
 set (swap_compile_flags "${test_compile_flags} -DBOOST_UNORDERED_SWAP_METHOD=2")
 
-#-------------------------------------------------------------------------------
-# Unordered Tests
-set (unordered_tests
-        fwd_set_test
-        fwd_map_test
-        compile_set
-        compile_map
-        link_test_1
-         link_test_2
-        simple_tests
-        equivalent_keys_tests
-        constructor_tests
-        copy_tests
-        move_tests.cpp 
-        assign_tests
-        insert_tests
-        insert_stable_tests
-        unnecessary_copy_tests
-        erase_tests
-        erase_equiv_tests
-        find_tests
-        at_tests
-        bucket_tests
-        load_factor_tests
-        rehash_tests
-        equality_tests
-)
-#-- Create an executable test for each source
-foreach(test ${unordered_tests})
-    boost_test_run(${test} "unordered/${test}.cpp"
-                    COMPILE_FLAGS ${test_compile_flags} 
-                    DEPENDS boost_unit_test_framework) 
-endforeach(test ${unordered_tests})
 
-#-- run the swap test
-boost_test_run(swap_tests 
-                COMPILE_FLAGS ${swap_compile_flags} 
-                DEPENDS boost_unit_test_framework)
 
-#-------------------------------------------------------------------------------
-# Exception Tests
-set (exception_tests
-    constructor_exception_tests
-    copy_exception_tests
-    assign_exception_tests
-    insert_exception_tests
-    erase_exception_tests
-    rehash_exception_tests
-)
-
-#-- Create an executable test for each source
-foreach(test ${exception_tests})
-    boost_test_run(${test} "exception/${test}.cpp"
-                    COMPILE_FLAGS ${test_compile_flags} 
-                    DEPENDS boost_unit_test_framework) 
-endforeach(test ${unordered_tests})
-
-#-- run the swap test
-boost_test_run(swap_swap_exception_tests 
-                COMPILE_FLAGS ${swap_compile_flags} 
-                DEPENDS boost_unit_test_framework)
+add_subdirectory(exception)
+add_subdirectory(unordered)
\ No newline at end of file
diff --git a/test/exception/CMakeLists.txt b/test/exception/CMakeLists.txt
new file mode 100644
index 00000000..ec36ff62
--- /dev/null
+++ b/test/exception/CMakeLists.txt
@@ -0,0 +1,19 @@
+
+foreach(test 
+    constructor_exception_tests
+    copy_exception_tests
+    assign_exception_tests
+    insert_exception_tests
+    erase_exception_tests
+    rehash_exception_tests
+    )
+    boost_test_run(${test} 
+                    COMPILE_FLAGS ${test_compile_flags} 
+                    DEPENDS boost_unit_test_framework) 
+endforeach(test ${unordered_tests})
+
+#-- run the swap test
+boost_test_run(swap_exception_tests 
+                COMPILE_FLAGS ${swap_compile_flags} 
+                DEPENDS boost_unit_test_framework)
+
diff --git a/test/unordered/CMakeLists.txt b/test/unordered/CMakeLists.txt
new file mode 100644
index 00000000..f3c58ad1
--- /dev/null
+++ b/test/unordered/CMakeLists.txt
@@ -0,0 +1,37 @@
+#-------------------------------------------------------------------------------
+# Unordered Tests
+foreach(test
+    fwd_set_test
+    fwd_map_test
+    compile_set
+    compile_map
+    simple_tests
+    equivalent_keys_tests
+    constructor_tests
+    copy_tests
+    move_tests
+    assign_tests
+    insert_tests
+    insert_stable_tests
+    unnecessary_copy_tests
+    erase_tests
+    erase_equiv_tests
+    find_tests
+    at_tests
+    bucket_tests
+    load_factor_tests
+    rehash_tests
+    equality_tests
+    )
+  boost_test_run(${test} 
+    COMPILE_FLAGS ${test_compile_flags} 
+    DEPENDS boost_unit_test_framework) 
+endforeach()
+
+boost_test_run(link_test link_test_1.cpp link_test_2.cpp)
+
+#-- run the swap test
+boost_test_run(swap_tests 
+                COMPILE_FLAGS ${swap_compile_flags} 
+                DEPENDS boost_unit_test_framework)
+