diff --git a/tests/daemon/face/dummy-face.cpp b/tests/daemon/face/dummy-face.cpp
index c4f6154..5c9895b 100644
--- a/tests/daemon/face/dummy-face.cpp
+++ b/tests/daemon/face/dummy-face.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2014-2015,  Regents of the University of California,
+ * Copyright (c) 2014-2016,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -55,28 +55,28 @@
 
 private:
   virtual void
-  doSendInterest(const Interest& interest) DECL_OVERRIDE
+  doSendInterest(const Interest& interest) override
   {
     this->sentInterests.push_back(interest);
     this->afterSend(tlv::Interest);
   }
 
   virtual void
-  doSendData(const Data& data) DECL_OVERRIDE
+  doSendData(const Data& data) override
   {
     this->sentData.push_back(data);
     this->afterSend(tlv::Data);
   }
 
   virtual void
-  doSendNack(const lp::Nack& nack) DECL_OVERRIDE
+  doSendNack(const lp::Nack& nack) override
   {
     this->sentNacks.push_back(nack);
     this->afterSend(lp::tlv::Nack);
   }
 
   virtual void
-  doReceivePacket(Transport::Packet&& packet) DECL_OVERRIDE
+  doReceivePacket(Transport::Packet&& packet) override
   {
     BOOST_ASSERT(false);
   }
diff --git a/tests/daemon/face/dummy-receive-link-service.hpp b/tests/daemon/face/dummy-receive-link-service.hpp
index 91dabd2..1d40653 100644
--- a/tests/daemon/face/dummy-receive-link-service.hpp
+++ b/tests/daemon/face/dummy-receive-link-service.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2014-2015,  Regents of the University of California,
+ * Copyright (c) 2014-2016,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -41,25 +41,25 @@
 {
 private:
   virtual void
-  doSendInterest(const Interest& interest) DECL_OVERRIDE
+  doSendInterest(const Interest& interest) override
   {
     BOOST_ASSERT(false);
   }
 
   virtual void
-  doSendData(const Data& data) DECL_OVERRIDE
+  doSendData(const Data& data) override
   {
     BOOST_ASSERT(false);
   }
 
   virtual void
-  doSendNack(const lp::Nack& nack) DECL_OVERRIDE
+  doSendNack(const lp::Nack& nack) override
   {
     BOOST_ASSERT(false);
   }
 
   virtual void
-  doReceivePacket(Transport::Packet&& packet) DECL_OVERRIDE
+  doReceivePacket(Transport::Packet&& packet) override
   {
     receivedPackets.push_back(packet);
   }
diff --git a/tests/daemon/face/dummy-transport.hpp b/tests/daemon/face/dummy-transport.hpp
index f957e1e..4dfda76 100644
--- a/tests/daemon/face/dummy-transport.hpp
+++ b/tests/daemon/face/dummy-transport.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2014-2015,  Regents of the University of California,
+ * Copyright (c) 2014-2016,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -81,21 +81,21 @@
 
 protected:
   virtual void
-  beforeChangePersistency(ndn::nfd::FacePersistency newPersistency) DECL_OVERRIDE
+  beforeChangePersistency(ndn::nfd::FacePersistency newPersistency) override
   {
     // accept everything
   }
 
 private:
   virtual void
-  doClose() DECL_OVERRIDE
+  doClose() override
   {
     isClosed = true;
     this->setState(TransportState::CLOSED);
   }
 
   virtual void
-  doSend(Packet&& packet) DECL_OVERRIDE
+  doSend(Packet&& packet) override
   {
     sentPackets.push_back(std::move(packet));
   }
diff --git a/tests/daemon/fw/dummy-strategy.hpp b/tests/daemon/fw/dummy-strategy.hpp
index 33d2656..25623cb 100644
--- a/tests/daemon/fw/dummy-strategy.hpp
+++ b/tests/daemon/fw/dummy-strategy.hpp
@@ -1,12 +1,12 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2014,  Regents of the University of California,
- *                      Arizona Board of Regents,
- *                      Colorado State University,
- *                      University Pierre & Marie Curie, Sorbonne University,
- *                      Washington University in St. Louis,
- *                      Beijing Institute of Technology,
- *                      The University of Memphis
+ * Copyright (c) 2014-2016,  Regents of the University of California,
+ *                           Arizona Board of Regents,
+ *                           Colorado State University,
+ *                           University Pierre & Marie Curie, Sorbonne University,
+ *                           Washington University in St. Louis,
+ *                           Beijing Institute of Technology,
+ *                           The University of Memphis.
  *
  * This file is part of NFD (Named Data Networking Forwarding Daemon).
  * See AUTHORS.md for complete list of NFD authors and contributors.
@@ -53,14 +53,15 @@
    *  otherwise, reject pending Interest action is invoked.
    */
   virtual void
-  afterReceiveInterest(const Face& inFace, const Interest& interest,
+  afterReceiveInterest(const Face& inFace,
+                       const Interest& interest,
                        shared_ptr<fib::Entry> fibEntry,
-                       shared_ptr<pit::Entry> pitEntry) DECL_OVERRIDE
+                       shared_ptr<pit::Entry> pitEntry) override
   {
     ++afterReceiveInterest_count;
     if (wantAfterReceiveInterestCalls) {
-      afterReceiveInterestCalls.push_back(std::make_tuple(inFace.getId(),
-        interest, fibEntry, pitEntry));
+      afterReceiveInterestCalls.push_back(std::make_tuple(inFace.getId(), interest,
+                                                          fibEntry, pitEntry));
     }
 
     if (interestOutFace) {
@@ -73,21 +74,23 @@
 
   virtual void
   beforeSatisfyInterest(shared_ptr<pit::Entry> pitEntry,
-                        const Face& inFace, const Data& data) DECL_OVERRIDE
+                        const Face& inFace,
+                        const Data& data) override
   {
     ++beforeSatisfyInterest_count;
   }
 
   virtual void
-  beforeExpirePendingInterest(shared_ptr<pit::Entry> pitEntry) DECL_OVERRIDE
+  beforeExpirePendingInterest(shared_ptr<pit::Entry> pitEntry) override
   {
     ++beforeExpirePendingInterest_count;
   }
 
   virtual void
-  afterReceiveNack(const Face& inFace, const lp::Nack& nack,
+  afterReceiveNack(const Face& inFace,
+                   const lp::Nack& nack,
                    shared_ptr<fib::Entry> fibEntry,
-                   shared_ptr<pit::Entry> pitEntry) DECL_OVERRIDE
+                   shared_ptr<pit::Entry> pitEntry) override
   {
     ++afterReceiveNack_count;
   }
@@ -102,7 +105,6 @@
   int beforeSatisfyInterest_count;
   int beforeExpirePendingInterest_count;
   int afterReceiveNack_count;
-
 };
 
 } // namespace tests
diff --git a/tests/daemon/fw/forwarder.t.cpp b/tests/daemon/fw/forwarder.t.cpp
index 45014ff..310139f 100644
--- a/tests/daemon/fw/forwarder.t.cpp
+++ b/tests/daemon/fw/forwarder.t.cpp
@@ -133,14 +133,14 @@
   }
 
   virtual void
-  onDataUnsolicited(Face& inFace, const Data& data) DECL_OVERRIDE
+  onDataUnsolicited(Face& inFace, const Data& data) override
   {
     ++onDataUnsolicited_count;
   }
 
 protected:
   virtual void
-  dispatchToStrategy(shared_ptr<pit::Entry> pitEntry, function<void(fw::Strategy*)> f) DECL_OVERRIDE
+  dispatchToStrategy(shared_ptr<pit::Entry> pitEntry, function<void(fw::Strategy*)> f) override
   {
     ++dispatchToStrategy_count;
   }
diff --git a/tests/daemon/fw/strategy-tester.hpp b/tests/daemon/fw/strategy-tester.hpp
index 75c5a67..ed831ff 100644
--- a/tests/daemon/fw/strategy-tester.hpp
+++ b/tests/daemon/fw/strategy-tester.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2014-2015,  Regents of the University of California,
+ * Copyright (c) 2014-2016,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -54,14 +54,14 @@
   virtual void
   sendInterest(shared_ptr<pit::Entry> pitEntry,
                shared_ptr<Face> outFace,
-               bool wantNewNonce = false) DECL_OVERRIDE;
+               bool wantNewNonce = false) override;
 
   virtual void
-  rejectPendingInterest(shared_ptr<pit::Entry> pitEntry) DECL_OVERRIDE;
+  rejectPendingInterest(shared_ptr<pit::Entry> pitEntry) override;
 
   virtual void
   sendNack(shared_ptr<pit::Entry> pitEntry, const Face& outFace,
-           const lp::NackHeader& header) DECL_OVERRIDE;
+           const lp::NackHeader& header) override;
 
 public:
   struct SendInterestArgs
diff --git a/tests/daemon/mgmt/face-manager.t.cpp b/tests/daemon/mgmt/face-manager.t.cpp
index d3e0b34..851a785 100644
--- a/tests/daemon/mgmt/face-manager.t.cpp
+++ b/tests/daemon/mgmt/face-manager.t.cpp
@@ -335,12 +335,12 @@
   createFace(const FaceUri& uri,
              ndn::nfd::FacePersistency persistency,
              const FaceCreatedCallback& onCreated,
-             const FaceCreationFailedCallback& onConnectFailed) DECL_OVERRIDE
+             const FaceCreationFailedCallback& onConnectFailed) override
   {
   }
 
   virtual std::vector<shared_ptr<const Channel>>
-  getChannels() const DECL_OVERRIDE
+  getChannels() const override
   {
     return m_channels;
   }