diff --git a/tests/unit/clients/iterative-query-controller.cpp b/tests/unit/clients/iterative-query-controller.cpp
index 93bbb4e..16087e5 100644
--- a/tests/unit/clients/iterative-query-controller.cpp
+++ b/tests/unit/clients/iterative-query-controller.cpp
@@ -67,7 +67,6 @@
   ndn::util::DummyClientFace producerFace;
   ndn::util::DummyClientFace consumerFace;
 
-  Name hint;
   Validator validator;
   ndns::NameServer top;
   ndns::NameServer net;
@@ -82,7 +81,6 @@
   using std::string;
   using ndns::NameServer;
 
-  string hint;
   Name name = m_ndnsim.getName();
   Name dstLabel(name.append("www"));
   name::Component rrType("TXT");
diff --git a/tests/unit/clients/query.cpp b/tests/unit/clients/query.cpp
index 40fdfc3..0e4a1e4 100644
--- a/tests/unit/clients/query.cpp
+++ b/tests/unit/clients/query.cpp
@@ -31,13 +31,11 @@
 {
   Name zone("/net");
   name::Component qType = ndns::label::NDNS_ITERATIVE_QUERY;
-  Name hint;
-  ndns::Query q(hint, zone, qType);
+  ndns::Query q(zone, qType);
 
   q.setRrLabel(Name("/ndnsim/www"));
   BOOST_CHECK_EQUAL(q.getRrLabel(), Name("ndnsim/www"));
   BOOST_CHECK_EQUAL(q.getRrLabel(), Name("/ndnsim/www"));
-  BOOST_CHECK_EQUAL(q.getHint(), hint);
   BOOST_CHECK_EQUAL(q.getZone(), zone);
   BOOST_CHECK_EQUAL(q.getQueryType(), qType);
 
@@ -46,23 +44,22 @@
 
   Interest interest = q.toInterest();
 
-  ndns::Query q2(hint, zone, qType);
-  BOOST_CHECK_EQUAL(q2.fromInterest(hint, zone, interest), true);
+  ndns::Query q2(zone, qType);
+  BOOST_CHECK_EQUAL(q2.fromInterest(zone, interest), true);
 
   ndns::Query q3;
-  BOOST_CHECK_EQUAL(q3.fromInterest(hint, zone, interest), true);
+  BOOST_CHECK_EQUAL(q3.fromInterest(zone, interest), true);
 
   BOOST_CHECK_EQUAL(q, q3);
   BOOST_CHECK_EQUAL(q, q2);
 
-  hint = Name("att");
-  ndns::Query q4(hint, zone, qType);
+  ndns::Query q4(zone, qType);
   q4.setRrLabel("/ndnsim/www");
   q4.setRrType(ndns::label::TXT_RR_TYPE);
   interest = q4.toInterest();
   ndns::Query q5;
 
-  BOOST_CHECK_EQUAL(q5.fromInterest(hint, zone, interest), true);
+  BOOST_CHECK_EQUAL(q5.fromInterest(zone, interest), true);
   BOOST_CHECK_EQUAL(q4, q5);
   BOOST_CHECK_NE(q2, q4);
  }
diff --git a/tests/unit/clients/response.cpp b/tests/unit/clients/response.cpp
index 5950063..c575c85 100644
--- a/tests/unit/clients/response.cpp
+++ b/tests/unit/clients/response.cpp
@@ -29,7 +29,6 @@
 
 BOOST_AUTO_TEST_CASE(Basic)
 {
-  Name hint;
   Name zone("/net");
   name::Component qType = ndns::label::NDNS_ITERATIVE_QUERY;
 
@@ -54,7 +53,7 @@
   // m_keyChain.sign(*data);
 
   ndns::Response r2;
-  BOOST_CHECK_EQUAL(r2.fromData(hint, zone, *data), true);
+  BOOST_CHECK_EQUAL(r2.fromData(zone, *data), true);
   BOOST_CHECK_EQUAL(r, r2);
 
   ndns::Response r4(zone, qType);
@@ -76,7 +75,7 @@
 
   ndns::Response r5(zone, qType);
 
-  BOOST_CHECK_EQUAL(r5.fromData(hint, zone, *data), true);
+  BOOST_CHECK_EQUAL(r5.fromData(zone, *data), true);
   BOOST_CHECK_EQUAL(r4, r5);
  }