diff --git a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/node_discoverer.hpp b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/node_discoverer.hpp
index ba3d363921..65a8b50822 100644
--- a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/node_discoverer.hpp
+++ b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/node_discoverer.hpp
@@ -311,8 +311,8 @@ class NodeDiscoverer : TimerBase
 
         if (!isRunning())
         {
-            trace(TraceDiscoveryTimerStart, get_node_info_client_.getRequestTimeout().toUSec());
             startPeriodic(get_node_info_client_.getRequestTimeout() * 2);
+            trace(TraceDiscoveryTimerStart, getPeriod().toUSec());
         }
     }
 
diff --git a/libuavcan/test/protocol/dynamic_node_id_server/node_discoverer.cpp b/libuavcan/test/protocol/dynamic_node_id_server/node_discoverer.cpp
index bdea141a06..427213bad1 100644
--- a/libuavcan/test/protocol/dynamic_node_id_server/node_discoverer.cpp
+++ b/libuavcan/test/protocol/dynamic_node_id_server/node_discoverer.cpp
@@ -134,7 +134,7 @@ TEST(dynamic_node_id_server_NodeDiscoverer, Basic)
      */
     handler.can_discover = true;
 
-    nodes.spinBoth(uavcan::MonotonicDuration::fromMSec(1100));
+    nodes.spinBoth(uavcan::MonotonicDuration::fromMSec(1900));
 
     ASSERT_EQ(1, tracer.countEvents(TraceDiscoveryNewNodeFound));
     ASSERT_EQ(1, tracer.countEvents(TraceDiscoveryTimerStart));
@@ -149,7 +149,7 @@ TEST(dynamic_node_id_server_NodeDiscoverer, Basic)
     node_status.uptime_sec += 5U;
     ASSERT_LE(0, node_status_pub.broadcast(node_status));
 
-    nodes.spinBoth(uavcan::MonotonicDuration::fromMSec(1100));
+    nodes.spinBoth(uavcan::MonotonicDuration::fromMSec(1900));
 
     ASSERT_EQ(1, tracer.countEvents(TraceDiscoveryNewNodeFound));
     ASSERT_EQ(1, tracer.countEvents(TraceDiscoveryTimerStart));