diff --git a/CMakeLists.txt b/CMakeLists.txt
index cde6791..2de8f1f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,7 +136,7 @@ endforeach()
 
 
 # ------------------------------------------------------------------------------
-# Add WChar support for the build
+# Add wchar and UTF-8 support for the build
 # ------------------------------------------------------------------------------
 if(NOT FORT_ENABLE_WCHAR)
     add_definitions(-DFT_CONGIG_DISABLE_WCHAR)
@@ -174,7 +174,7 @@ add_custom_target(headers SOURCES ${FortHeaders})
 
 
 # ------------------------------------------------------------------------------
-# Set preprocessor macros for all test builds
+# Set preprocessor macros for all test builds.
 # ------------------------------------------------------------------------------
 
 target_compile_definitions(${PROJECT_NAME}_test_dev PRIVATE FT_TEST_BUILD=1)
@@ -182,7 +182,7 @@ target_compile_definitions(${PROJECT_NAME}_test_cpp PRIVATE FT_TEST_BUILD=1)
 target_compile_definitions(${PROJECT_NAME}_test PRIVATE FT_TEST_BUILD=1)
 
 # ------------------------------------------------------------------------------
-# Astyle
+# Setup text formatting via astyle.
 # ------------------------------------------------------------------------------
 
 if(FORT_ENABLE_ASTYLE)
@@ -248,13 +248,13 @@ endif()
 
 
 # ------------------------------------------------------------------------------
-# Tests
+# Add examples and unit tests to ctest driver.
 # ------------------------------------------------------------------------------
 
 enable_testing()
-add_test(NAME ${PROJECT_NAME}_ex COMMAND ${PROJECT_NAME}_ex)
-add_test(NAME ${PROJECT_NAME}_print_styles COMMAND ${PROJECT_NAME}_print_styles)
-add_test(NAME ${PROJECT_NAME}_ex_cpp COMMAND ${PROJECT_NAME}_ex_cpp)
-add_test(NAME ${PROJECT_NAME}_test COMMAND ${PROJECT_NAME}_test)
-add_test(NAME ${PROJECT_NAME}_test_cpp COMMAND ${PROJECT_NAME}_test_cpp)
-add_test(NAME ${PROJECT_NAME}_test_dev COMMAND ${PROJECT_NAME}_test_dev)
+list(APPEND ${PROJECT_NAME}_ctests
+    ${${PROJECT_NAME}_tests}
+    ${${PROJECT_NAME}_examples})
+foreach(exe ${${PROJECT_NAME}_ctests})
+    add_test(NAME ${exe} COMMAND ${exe})
+endforeach()
diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
index 8b7a456..5db268b 100644
--- a/example/CMakeLists.txt
+++ b/example/CMakeLists.txt
@@ -14,8 +14,14 @@ add_executable(${PROJECT_NAME}_ex_cpp
 target_link_libraries(${PROJECT_NAME}_ex_cpp
     fort)
 
+set(${PROJECT_NAME}_examples
+    ${PROJECT_NAME}_ex
+    ${PROJECT_NAME}_print_styles
+    ${PROJECT_NAME}_ex_cpp
+    PARENT_SCOPE)
+
 if(DEFINED FORT_LINK_LIBRARIES)
-    target_link_libraries(${PROJECT_NAME}_ex "${FORT_LINK_LIBRARIES}")
-    target_link_libraries(${PROJECT_NAME}_print_styles "${FORT_LINK_LIBRARIES}")
-    target_link_libraries(${PROJECT_NAME}_ex_cpp "${FORT_LINK_LIBRARIES}")
+    foreach(exe ${${PROJECT_NAME}_examples})
+        target_link_libraries(${exe} "${FORT_LINK_LIBRARIES}")
+    endforeach()
 endif()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 928c11d..132a946 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -53,8 +53,14 @@ target_include_directories(${PROJECT_NAME}_test_cpp
         ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
+set(${PROJECT_NAME}_tests
+    ${PROJECT_NAME}_test_dev
+    ${PROJECT_NAME}_test_cpp
+    ${PROJECT_NAME}_test
+    PARENT_SCOPE)
+
 if(DEFINED FORT_LINK_LIBRARIES)
-    target_link_libraries(${PROJECT_NAME}_test_dev "${FORT_LINK_LIBRARIES}")
-    target_link_libraries(${PROJECT_NAME}_test_cpp "${FORT_LINK_LIBRARIES}")
-    target_link_libraries(${PROJECT_NAME}_test "${FORT_LINK_LIBRARIES}")
+    foreach(exe ${${PROJECT_NAME}_tests})
+        target_link_libraries(${exe} "${FORT_LINK_LIBRARIES}")
+    endforeach()
 endif()