diff --git a/libuavcan/test/linked_list.cpp b/libuavcan/test/util/linked_list.cpp
similarity index 98%
rename from libuavcan/test/linked_list.cpp
rename to libuavcan/test/util/linked_list.cpp
index 14a8620ab7..392215a934 100644
--- a/libuavcan/test/linked_list.cpp
+++ b/libuavcan/test/util/linked_list.cpp
@@ -3,7 +3,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/linked_list.hpp>
+#include <uavcan/util/linked_list.hpp>
 
 struct ListItem : uavcan::LinkedListNode<ListItem>
 {
diff --git a/libuavcan/test/map.cpp b/libuavcan/test/util/map.cpp
similarity index 99%
rename from libuavcan/test/map.cpp
rename to libuavcan/test/util/map.cpp
index 38fdfebebc..010c4f0c40 100644
--- a/libuavcan/test/map.cpp
+++ b/libuavcan/test/util/map.cpp
@@ -6,7 +6,7 @@
 #include <cstdio>
 #include <memory>
 #include <gtest/gtest.h>
-#include <uavcan/map.hpp>
+#include <uavcan/util/map.hpp>
 
 
 static std::string toString(long x)
diff --git a/libuavcan/test/util/compile_time.cpp b/libuavcan/test/util/templates.cpp
similarity index 97%
rename from libuavcan/test/util/compile_time.cpp
rename to libuavcan/test/util/templates.cpp
index f65ab039f2..f8844eec73 100644
--- a/libuavcan/test/util/compile_time.cpp
+++ b/libuavcan/test/util/templates.cpp
@@ -3,7 +3,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/util/compile_time.hpp>
+#include <uavcan/util/templates.hpp>
 
 struct NonConvertible { };