diff --git a/tests/chunks/discover-version.t.cpp b/tests/chunks/discover-version.t.cpp
index 7d18886..a07ecce 100644
--- a/tests/chunks/discover-version.t.cpp
+++ b/tests/chunks/discover-version.t.cpp
@@ -63,8 +63,8 @@
   util::DummyClientFace face{m_io};
   Options opt;
   unique_ptr<DiscoverVersion> discover;
-  optional<Name> discoveredName;
-  optional<uint64_t> discoveredVersion;
+  std::optional<Name> discoveredName;
+  std::optional<uint64_t> discoveredVersion;
   bool isDiscoveryFinished = false;
 };
 
diff --git a/tests/peek/ndnpeek.t.cpp b/tests/peek/ndnpeek.t.cpp
index 30c305a..c3979fd 100644
--- a/tests/peek/ndnpeek.t.cpp
+++ b/tests/peek/ndnpeek.t.cpp
@@ -86,7 +86,7 @@
   checkOutput(output_test_stream& output, const Data& data)
   {
     const Block& block = data.wireEncode();
-    std::string expected(reinterpret_cast<const char*>(block.wire()), block.size());
+    std::string expected(reinterpret_cast<const char*>(block.data()), block.size());
     BOOST_CHECK(output.is_equal(expected));
   }
 
@@ -94,7 +94,7 @@
   checkOutput(output_test_stream& output, const lp::Nack& nack)
   {
     const Block& block = nack.getHeader().wireEncode();
-    std::string expected(reinterpret_cast<const char*>(block.wire()), block.size());
+    std::string expected(reinterpret_cast<const char*>(block.data()), block.size());
     BOOST_CHECK(output.is_equal(expected));
   }
 };
@@ -252,7 +252,7 @@
 {
   auto options = makeDefaultOptions();
   options.interestLifetime = 1_s;
-  options.timeout = nullopt;
+  options.timeout = std::nullopt;
   initialize(options);
 
   BOOST_CHECK_EQUAL(face.sentInterests.size(), 0);