diff --git a/libuavcan_drivers/linux/CMakeLists.txt b/libuavcan_drivers/linux/CMakeLists.txt
index c7fd39ea71..6069f762d0 100644
--- a/libuavcan_drivers/linux/CMakeLists.txt
+++ b/libuavcan_drivers/linux/CMakeLists.txt
@@ -26,25 +26,37 @@ else ()
 endif ()
 
 #
-# Test/demo executables
+# Applications - tests, tools.
 #
 include_directories(include)
-set(CMAKE_CXX_FLAGS "-Wall -Wextra -Werror -pedantic -std=c++0x -g3")  # GCC or Clang
+set(CMAKE_CXX_FLAGS "-Wall -Wextra -pedantic -std=c++0x")  # GCC or Clang
 
-add_executable(test_clock test/test_clock.cpp)
+#
+# Tests
+# These aren't installed, an average library user should not care about them.
+#
+add_executable(test_clock apps/test_clock.cpp)
 target_link_libraries(test_clock ${UAVCAN_LIB} rt)
 
-add_executable(test_socket test/test_socket.cpp)
+add_executable(test_socket apps/test_socket.cpp)
 target_link_libraries(test_socket ${UAVCAN_LIB} rt)
 
-add_executable(test_node test/test_node.cpp)
+add_executable(test_node apps/test_node.cpp)
 target_link_libraries(test_node ${UAVCAN_LIB} rt)
 
-add_executable(test_node_status_monitor test/test_node_status_monitor.cpp)
-target_link_libraries(test_node_status_monitor ${UAVCAN_LIB} rt)
-
-add_executable(test_time_sync test/test_time_sync.cpp)
+add_executable(test_time_sync apps/test_time_sync.cpp)
 target_link_libraries(test_time_sync ${UAVCAN_LIB} rt)
 
-add_executable(test_nodetool test/test_nodetool.cpp)
-target_link_libraries(test_nodetool ${UAVCAN_LIB} rt)
+#
+# Tools
+# Someday they will be replaced with Python scripts (pyuavcan is not finished at the moment)
+#
+add_executable(uavcan_status_monitor apps/uavcan_status_monitor.cpp)
+target_link_libraries(uavcan_status_monitor ${UAVCAN_LIB} rt)
+
+add_executable(uavcan_nodetool apps/uavcan_nodetool.cpp)
+target_link_libraries(uavcan_nodetool ${UAVCAN_LIB} rt)
+
+install(TARGETS uavcan_status_monitor
+                uavcan_nodetool
+        RUNTIME DESTINATION bin)
diff --git a/libuavcan_drivers/linux/test/debug.hpp b/libuavcan_drivers/linux/apps/debug.hpp
similarity index 100%
rename from libuavcan_drivers/linux/test/debug.hpp
rename to libuavcan_drivers/linux/apps/debug.hpp
diff --git a/libuavcan_drivers/linux/test/test_clock.cpp b/libuavcan_drivers/linux/apps/test_clock.cpp
similarity index 100%
rename from libuavcan_drivers/linux/test/test_clock.cpp
rename to libuavcan_drivers/linux/apps/test_clock.cpp
diff --git a/libuavcan_drivers/linux/test/test_node.cpp b/libuavcan_drivers/linux/apps/test_node.cpp
similarity index 100%
rename from libuavcan_drivers/linux/test/test_node.cpp
rename to libuavcan_drivers/linux/apps/test_node.cpp
diff --git a/libuavcan_drivers/linux/test/test_socket.cpp b/libuavcan_drivers/linux/apps/test_socket.cpp
similarity index 100%
rename from libuavcan_drivers/linux/test/test_socket.cpp
rename to libuavcan_drivers/linux/apps/test_socket.cpp
diff --git a/libuavcan_drivers/linux/test/test_time_sync.cpp b/libuavcan_drivers/linux/apps/test_time_sync.cpp
similarity index 100%
rename from libuavcan_drivers/linux/test/test_time_sync.cpp
rename to libuavcan_drivers/linux/apps/test_time_sync.cpp
diff --git a/libuavcan_drivers/linux/test/test_nodetool.cpp b/libuavcan_drivers/linux/apps/uavcan_nodetool.cpp
similarity index 100%
rename from libuavcan_drivers/linux/test/test_nodetool.cpp
rename to libuavcan_drivers/linux/apps/uavcan_nodetool.cpp
diff --git a/libuavcan_drivers/linux/test/test_node_status_monitor.cpp b/libuavcan_drivers/linux/apps/uavcan_status_monitor.cpp
similarity index 100%
rename from libuavcan_drivers/linux/test/test_node_status_monitor.cpp
rename to libuavcan_drivers/linux/apps/uavcan_status_monitor.cpp