diff --git a/libuavcan/test/protocol/dynamic_node_id_server/distributed/server.cpp b/libuavcan/test/protocol/dynamic_node_id_server/distributed/server.cpp
index 425fa64573..e46cf27a4e 100644
--- a/libuavcan/test/protocol/dynamic_node_id_server/distributed/server.cpp
+++ b/libuavcan/test/protocol/dynamic_node_id_server/distributed/server.cpp
@@ -37,7 +37,7 @@ public:
 };
 
 
-TEST(DynamicNodeIDServer, RaftCoreBasic)
+TEST(dynamic_node_id_server_RaftCore, Basic)
 {
     using namespace uavcan::dynamic_node_id_server::distributed;
     using namespace uavcan::protocol::dynamic_node_id::server;
@@ -116,7 +116,7 @@ TEST(DynamicNodeIDServer, RaftCoreBasic)
 }
 
 
-TEST(DynamicNodeIDServer, Main)
+TEST(dynamic_node_id_server_Server, Basic)
 {
     using namespace uavcan::dynamic_node_id_server;
     using namespace uavcan::protocol::dynamic_node_id;
@@ -175,7 +175,7 @@ TEST(DynamicNodeIDServer, Main)
 }
 
 
-TEST(DynamicNodeIDServer, ObjectSizes)
+TEST(dynamic_node_id_server, ObjectSizes)
 {
     using namespace uavcan::dynamic_node_id_server;
 
diff --git a/libuavcan/test/protocol/dynamic_node_id_server/event.cpp b/libuavcan/test/protocol/dynamic_node_id_server/event.cpp
index b8efb3de25..b6dd2697ec 100644
--- a/libuavcan/test/protocol/dynamic_node_id_server/event.cpp
+++ b/libuavcan/test/protocol/dynamic_node_id_server/event.cpp
@@ -6,7 +6,7 @@
 #include <uavcan/protocol/dynamic_node_id_server/event.hpp>
 
 
-TEST(DynamicNodeIDServer, EventCodeToString)
+TEST(dynamic_node_id_server_EventTracer, EventCodeToString)
 {
     using namespace uavcan::dynamic_node_id_server;