diff --git a/tests/test-consumer.cpp b/tests/test-consumer.cpp
index d1e6115..67b524c 100644
--- a/tests/test-consumer.cpp
+++ b/tests/test-consumer.cpp
@@ -18,6 +18,7 @@
  **/
 
 #include "PSync/consumer.hpp"
+#include "unit-test-time-fixture.hpp"
 
 #include <boost/test/unit_test.hpp>
 #include <ndn-cxx/name.hpp>
@@ -56,6 +57,29 @@
   BOOST_CHECK(!consumer.addSubscription(subscription));
 }
 
+BOOST_FIXTURE_TEST_CASE(ConstantTimeoutForFirstSegment, ndn::tests::UnitTestTimeFixture)
+{
+  util::DummyClientFace face(io, {true, true});
+  Consumer consumer(Name("/psync"), face,
+                    [] (const vector<Name>&) {},
+                    [] (const vector<MissingDataInfo>&) {},
+                    40, 0.001,
+                    ndn::time::milliseconds(4000),
+                    ndn::time::milliseconds(4000));
+
+  consumer.sendHelloInterest();
+  advanceClocks(ndn::time::milliseconds(4000));
+  BOOST_CHECK_EQUAL(face.sentInterests.size(), 1);
+  face.sentInterests.clear();
+  consumer.stop();
+
+  consumer.m_iblt = ndn::Name("test");
+  consumer.sendSyncInterest();
+  advanceClocks(ndn::time::milliseconds(4000));
+  BOOST_CHECK_EQUAL(face.sentInterests.size(), 1);
+  consumer.stop();
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 } // namespace psync
\ No newline at end of file
diff --git a/tests/test-full-producer.cpp b/tests/test-full-producer.cpp
index 8190446..2bd7db4 100644
--- a/tests/test-full-producer.cpp
+++ b/tests/test-full-producer.cpp
@@ -18,6 +18,7 @@
  **/
 
 #include "PSync/full-producer.hpp"
+#include "unit-test-time-fixture.hpp"
 
 #include <boost/test/unit_test.hpp>
 #include <ndn-cxx/name.hpp>
@@ -50,6 +51,20 @@
   BOOST_REQUIRE_NO_THROW(node.onSyncInterest(syncPrefix, Interest(syncInterestName)));
 }
 
+BOOST_FIXTURE_TEST_CASE(ConstantTimeoutForFirstSegment, ndn::tests::UnitTestTimeFixture)
+{
+  Name syncPrefix("/psync"), userNode("/testUser");
+  util::DummyClientFace face(io, {true, true});
+
+  FullProducer node(40, face, syncPrefix, userNode, nullptr, ndn::time::milliseconds(8000));
+  advanceClocks(ndn::time::milliseconds(10));
+  face.sentInterests.clear();
+
+  // full sync sends the next one in interest lifetime / 2 +- jitter
+  advanceClocks(ndn::time::milliseconds(6000));
+  BOOST_CHECK_EQUAL(face.sentInterests.size(), 1);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 } // namespace psync
\ No newline at end of file