diff --git a/README-dev.md b/README-dev.md
index 8dd53d1..6bd7644 100644
--- a/README-dev.md
+++ b/README-dev.md
@@ -46,7 +46,7 @@
 If you are affiliated to an NSF-supported NDN project institution, please use the [NDN Team License
 Boilerplate](https://redmine.named-data.net/projects/ndn-cxx/wiki/NDN_Team_License_Boilerplate_(ndn-cxx)).
 
-Running unit-tests
+Running unit tests
 ------------------
 
 To run unit tests, ndn-cxx needs to be configured, build with unit test support, and installed
@@ -68,7 +68,7 @@
 For example, it is possible to choose to run only a specific test suite, only a specific
 test case within a suite, or specific test cases within specific test suites:
 
-    # Run only Face test suite tests (tests/unit-tests/face.t.cpp)
+    # Run only Face test suite tests (tests/unit/face.t.cpp)
     ./build/unit-tests -t TestFace
 
     # Run only test case ExpressInterestData from the same test suite
diff --git a/tests/unit-tests/data.t.cpp b/tests/unit/data.t.cpp
similarity index 100%
rename from tests/unit-tests/data.t.cpp
rename to tests/unit/data.t.cpp
diff --git a/tests/unit-tests/delegation-list.t.cpp b/tests/unit/delegation-list.t.cpp
similarity index 100%
rename from tests/unit-tests/delegation-list.t.cpp
rename to tests/unit/delegation-list.t.cpp
diff --git a/tests/unit-tests/delegation.t.cpp b/tests/unit/delegation.t.cpp
similarity index 96%
rename from tests/unit-tests/delegation.t.cpp
rename to tests/unit/delegation.t.cpp
index f15f578..6cf03dd 100644
--- a/tests/unit-tests/delegation.t.cpp
+++ b/tests/unit/delegation.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/encoding/block-helpers.t.cpp b/tests/unit/encoding/block-helpers.t.cpp
similarity index 100%
rename from tests/unit-tests/encoding/block-helpers.t.cpp
rename to tests/unit/encoding/block-helpers.t.cpp
diff --git a/tests/unit-tests/encoding/block.t.cpp b/tests/unit/encoding/block.t.cpp
similarity index 100%
rename from tests/unit-tests/encoding/block.t.cpp
rename to tests/unit/encoding/block.t.cpp
diff --git a/tests/unit-tests/encoding/buffer-stream.t.cpp b/tests/unit/encoding/buffer-stream.t.cpp
similarity index 96%
rename from tests/unit-tests/encoding/buffer-stream.t.cpp
rename to tests/unit/encoding/buffer-stream.t.cpp
index 9c712ea..9c95b2c 100644
--- a/tests/unit-tests/encoding/buffer-stream.t.cpp
+++ b/tests/unit/encoding/buffer-stream.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/encoding/encoder.t.cpp b/tests/unit/encoding/encoder.t.cpp
similarity index 98%
rename from tests/unit-tests/encoding/encoder.t.cpp
rename to tests/unit/encoding/encoder.t.cpp
index 2534419..47cf8e4 100644
--- a/tests/unit-tests/encoding/encoder.t.cpp
+++ b/tests/unit/encoding/encoder.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/encoding/encoding-buffer.t.cpp b/tests/unit/encoding/encoding-buffer.t.cpp
similarity index 98%
rename from tests/unit-tests/encoding/encoding-buffer.t.cpp
rename to tests/unit/encoding/encoding-buffer.t.cpp
index 153b7e9..646024b 100644
--- a/tests/unit-tests/encoding/encoding-buffer.t.cpp
+++ b/tests/unit/encoding/encoding-buffer.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/encoding/estimator.t.cpp b/tests/unit/encoding/estimator.t.cpp
similarity index 100%
rename from tests/unit-tests/encoding/estimator.t.cpp
rename to tests/unit/encoding/estimator.t.cpp
diff --git a/tests/unit-tests/encoding/nfd-constants.t.cpp b/tests/unit/encoding/nfd-constants.t.cpp
similarity index 100%
rename from tests/unit-tests/encoding/nfd-constants.t.cpp
rename to tests/unit/encoding/nfd-constants.t.cpp
diff --git a/tests/unit-tests/encoding/tlv.t.cpp b/tests/unit/encoding/tlv.t.cpp
similarity index 100%
rename from tests/unit-tests/encoding/tlv.t.cpp
rename to tests/unit/encoding/tlv.t.cpp
diff --git a/tests/unit-tests/exclude.t.cpp b/tests/unit/exclude.t.cpp
similarity index 100%
rename from tests/unit-tests/exclude.t.cpp
rename to tests/unit/exclude.t.cpp
diff --git a/tests/unit-tests/face.t.cpp b/tests/unit/face.t.cpp
similarity index 100%
rename from tests/unit-tests/face.t.cpp
rename to tests/unit/face.t.cpp
diff --git a/tests/unit-tests/identity-management-time-fixture.hpp b/tests/unit/identity-management-time-fixture.hpp
similarity index 95%
rename from tests/unit-tests/identity-management-time-fixture.hpp
rename to tests/unit/identity-management-time-fixture.hpp
index b07ea12..cafa9c6 100644
--- a/tests/unit-tests/identity-management-time-fixture.hpp
+++ b/tests/unit/identity-management-time-fixture.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/ims/in-memory-storage-fifo.t.cpp b/tests/unit/ims/in-memory-storage-fifo.t.cpp
similarity index 100%
rename from tests/unit-tests/ims/in-memory-storage-fifo.t.cpp
rename to tests/unit/ims/in-memory-storage-fifo.t.cpp
diff --git a/tests/unit-tests/ims/in-memory-storage-lfu.t.cpp b/tests/unit/ims/in-memory-storage-lfu.t.cpp
similarity index 98%
rename from tests/unit-tests/ims/in-memory-storage-lfu.t.cpp
rename to tests/unit/ims/in-memory-storage-lfu.t.cpp
index 1fa8b83..ef58ce7 100644
--- a/tests/unit-tests/ims/in-memory-storage-lfu.t.cpp
+++ b/tests/unit/ims/in-memory-storage-lfu.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/ims/in-memory-storage-lru.t.cpp b/tests/unit/ims/in-memory-storage-lru.t.cpp
similarity index 98%
rename from tests/unit-tests/ims/in-memory-storage-lru.t.cpp
rename to tests/unit/ims/in-memory-storage-lru.t.cpp
index 80c59d5..9058d66 100644
--- a/tests/unit-tests/ims/in-memory-storage-lru.t.cpp
+++ b/tests/unit/ims/in-memory-storage-lru.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/ims/in-memory-storage-persistent.t.cpp b/tests/unit/ims/in-memory-storage-persistent.t.cpp
similarity index 100%
rename from tests/unit-tests/ims/in-memory-storage-persistent.t.cpp
rename to tests/unit/ims/in-memory-storage-persistent.t.cpp
diff --git a/tests/unit-tests/ims/in-memory-storage.t.cpp b/tests/unit/ims/in-memory-storage.t.cpp
similarity index 100%
rename from tests/unit-tests/ims/in-memory-storage.t.cpp
rename to tests/unit/ims/in-memory-storage.t.cpp
diff --git a/tests/unit-tests/interest-filter.t.cpp b/tests/unit/interest-filter.t.cpp
similarity index 100%
rename from tests/unit-tests/interest-filter.t.cpp
rename to tests/unit/interest-filter.t.cpp
diff --git a/tests/unit-tests/interest.t.cpp b/tests/unit/interest.t.cpp
similarity index 100%
rename from tests/unit-tests/interest.t.cpp
rename to tests/unit/interest.t.cpp
diff --git a/tests/unit-tests/key-locator.t.cpp b/tests/unit/key-locator.t.cpp
similarity index 100%
rename from tests/unit-tests/key-locator.t.cpp
rename to tests/unit/key-locator.t.cpp
diff --git a/tests/unit-tests/link.t.cpp b/tests/unit/link.t.cpp
similarity index 98%
rename from tests/unit-tests/link.t.cpp
rename to tests/unit/link.t.cpp
index bdeddef..347fb67 100644
--- a/tests/unit-tests/link.t.cpp
+++ b/tests/unit/link.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/lp/cache-policy.t.cpp b/tests/unit/lp/cache-policy.t.cpp
similarity index 97%
rename from tests/unit-tests/lp/cache-policy.t.cpp
rename to tests/unit/lp/cache-policy.t.cpp
index 106d685..6f1050d 100644
--- a/tests/unit-tests/lp/cache-policy.t.cpp
+++ b/tests/unit/lp/cache-policy.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/lp/nack-header.t.cpp b/tests/unit/lp/nack-header.t.cpp
similarity index 98%
rename from tests/unit-tests/lp/nack-header.t.cpp
rename to tests/unit/lp/nack-header.t.cpp
index 2140f81..0645f40 100644
--- a/tests/unit-tests/lp/nack-header.t.cpp
+++ b/tests/unit/lp/nack-header.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/lp/nack.t.cpp b/tests/unit/lp/nack.t.cpp
similarity index 96%
rename from tests/unit-tests/lp/nack.t.cpp
rename to tests/unit/lp/nack.t.cpp
index 8ca609d..436a649 100644
--- a/tests/unit-tests/lp/nack.t.cpp
+++ b/tests/unit/lp/nack.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/lp/packet.t.cpp b/tests/unit/lp/packet.t.cpp
similarity index 100%
rename from tests/unit-tests/lp/packet.t.cpp
rename to tests/unit/lp/packet.t.cpp
diff --git a/tests/unit-tests/lp/prefix-announcement-header.t.cpp b/tests/unit/lp/prefix-announcement-header.t.cpp
similarity index 100%
rename from tests/unit-tests/lp/prefix-announcement-header.t.cpp
rename to tests/unit/lp/prefix-announcement-header.t.cpp
diff --git a/tests/unit-tests/meta-info.t.cpp b/tests/unit/meta-info.t.cpp
similarity index 100%
rename from tests/unit-tests/meta-info.t.cpp
rename to tests/unit/meta-info.t.cpp
diff --git a/tests/unit-tests/mgmt/control-response.t.cpp b/tests/unit/mgmt/control-response.t.cpp
similarity index 96%
rename from tests/unit-tests/mgmt/control-response.t.cpp
rename to tests/unit/mgmt/control-response.t.cpp
index 10a3284..86aa780 100644
--- a/tests/unit-tests/mgmt/control-response.t.cpp
+++ b/tests/unit/mgmt/control-response.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/mgmt/dispatcher.t.cpp b/tests/unit/mgmt/dispatcher.t.cpp
similarity index 100%
rename from tests/unit-tests/mgmt/dispatcher.t.cpp
rename to tests/unit/mgmt/dispatcher.t.cpp
diff --git a/tests/unit-tests/mgmt/nfd/channel-status.t.cpp b/tests/unit/mgmt/nfd/channel-status.t.cpp
similarity index 97%
rename from tests/unit-tests/mgmt/nfd/channel-status.t.cpp
rename to tests/unit/mgmt/nfd/channel-status.t.cpp
index 7c89533..b3afde8 100644
--- a/tests/unit-tests/mgmt/nfd/channel-status.t.cpp
+++ b/tests/unit/mgmt/nfd/channel-status.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/mgmt/nfd/command-options.t.cpp b/tests/unit/mgmt/nfd/command-options.t.cpp
similarity index 100%
rename from tests/unit-tests/mgmt/nfd/command-options.t.cpp
rename to tests/unit/mgmt/nfd/command-options.t.cpp
diff --git a/tests/unit-tests/mgmt/nfd/control-command.t.cpp b/tests/unit/mgmt/nfd/control-command.t.cpp
similarity index 100%
rename from tests/unit-tests/mgmt/nfd/control-command.t.cpp
rename to tests/unit/mgmt/nfd/control-command.t.cpp
diff --git a/tests/unit-tests/mgmt/nfd/control-parameters.t.cpp b/tests/unit/mgmt/nfd/control-parameters.t.cpp
similarity index 100%
rename from tests/unit-tests/mgmt/nfd/control-parameters.t.cpp
rename to tests/unit/mgmt/nfd/control-parameters.t.cpp
diff --git a/tests/unit-tests/mgmt/nfd/controller-fixture.hpp b/tests/unit/mgmt/nfd/controller-fixture.hpp
similarity index 95%
rename from tests/unit-tests/mgmt/nfd/controller-fixture.hpp
rename to tests/unit/mgmt/nfd/controller-fixture.hpp
index 6054ed2..0d14296 100644
--- a/tests/unit-tests/mgmt/nfd/controller-fixture.hpp
+++ b/tests/unit/mgmt/nfd/controller-fixture.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -28,7 +28,7 @@
 
 #include "boost-test.hpp"
 #include "dummy-validator.hpp"
-#include "unit-tests/identity-management-time-fixture.hpp"
+#include "../../identity-management-time-fixture.hpp"
 
 namespace ndn {
 namespace nfd {
diff --git a/tests/unit-tests/mgmt/nfd/controller.t.cpp b/tests/unit/mgmt/nfd/controller.t.cpp
similarity index 100%
rename from tests/unit-tests/mgmt/nfd/controller.t.cpp
rename to tests/unit/mgmt/nfd/controller.t.cpp
diff --git a/tests/unit-tests/mgmt/nfd/cs-info.t.cpp b/tests/unit/mgmt/nfd/cs-info.t.cpp
similarity index 100%
rename from tests/unit-tests/mgmt/nfd/cs-info.t.cpp
rename to tests/unit/mgmt/nfd/cs-info.t.cpp
diff --git a/tests/unit-tests/mgmt/nfd/face-event-notification.t.cpp b/tests/unit/mgmt/nfd/face-event-notification.t.cpp
similarity index 99%
rename from tests/unit-tests/mgmt/nfd/face-event-notification.t.cpp
rename to tests/unit/mgmt/nfd/face-event-notification.t.cpp
index 249cd63..4da762b 100644
--- a/tests/unit-tests/mgmt/nfd/face-event-notification.t.cpp
+++ b/tests/unit/mgmt/nfd/face-event-notification.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/mgmt/nfd/face-query-filter.t.cpp b/tests/unit/mgmt/nfd/face-query-filter.t.cpp
similarity index 98%
rename from tests/unit-tests/mgmt/nfd/face-query-filter.t.cpp
rename to tests/unit/mgmt/nfd/face-query-filter.t.cpp
index d8dbc67..3b9b2a2 100644
--- a/tests/unit-tests/mgmt/nfd/face-query-filter.t.cpp
+++ b/tests/unit/mgmt/nfd/face-query-filter.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/mgmt/nfd/face-status.t.cpp b/tests/unit/mgmt/nfd/face-status.t.cpp
similarity index 100%
rename from tests/unit-tests/mgmt/nfd/face-status.t.cpp
rename to tests/unit/mgmt/nfd/face-status.t.cpp
diff --git a/tests/unit-tests/mgmt/nfd/fib-entry.t.cpp b/tests/unit/mgmt/nfd/fib-entry.t.cpp
similarity index 98%
rename from tests/unit-tests/mgmt/nfd/fib-entry.t.cpp
rename to tests/unit/mgmt/nfd/fib-entry.t.cpp
index 1e49710..fa7ec69 100644
--- a/tests/unit-tests/mgmt/nfd/fib-entry.t.cpp
+++ b/tests/unit/mgmt/nfd/fib-entry.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/mgmt/nfd/forwarder-status.t.cpp b/tests/unit/mgmt/nfd/forwarder-status.t.cpp
similarity index 100%
rename from tests/unit-tests/mgmt/nfd/forwarder-status.t.cpp
rename to tests/unit/mgmt/nfd/forwarder-status.t.cpp
diff --git a/tests/unit-tests/mgmt/nfd/rib-entry.t.cpp b/tests/unit/mgmt/nfd/rib-entry.t.cpp
similarity index 100%
rename from tests/unit-tests/mgmt/nfd/rib-entry.t.cpp
rename to tests/unit/mgmt/nfd/rib-entry.t.cpp
diff --git a/tests/unit-tests/mgmt/nfd/status-dataset.t.cpp b/tests/unit/mgmt/nfd/status-dataset.t.cpp
similarity index 100%
rename from tests/unit-tests/mgmt/nfd/status-dataset.t.cpp
rename to tests/unit/mgmt/nfd/status-dataset.t.cpp
diff --git a/tests/unit-tests/mgmt/nfd/strategy-choice.t.cpp b/tests/unit/mgmt/nfd/strategy-choice.t.cpp
similarity index 97%
rename from tests/unit-tests/mgmt/nfd/strategy-choice.t.cpp
rename to tests/unit/mgmt/nfd/strategy-choice.t.cpp
index a623858..9996541 100644
--- a/tests/unit-tests/mgmt/nfd/strategy-choice.t.cpp
+++ b/tests/unit/mgmt/nfd/strategy-choice.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/mgmt/status-dataset-context.t.cpp b/tests/unit/mgmt/status-dataset-context.t.cpp
similarity index 100%
rename from tests/unit-tests/mgmt/status-dataset-context.t.cpp
rename to tests/unit/mgmt/status-dataset-context.t.cpp
diff --git a/tests/unit-tests/name-component.t.cpp b/tests/unit/name-component.t.cpp
similarity index 100%
rename from tests/unit-tests/name-component.t.cpp
rename to tests/unit/name-component.t.cpp
diff --git a/tests/unit-tests/name.t.cpp b/tests/unit/name.t.cpp
similarity index 100%
rename from tests/unit-tests/name.t.cpp
rename to tests/unit/name.t.cpp
diff --git a/tests/unit-tests/ndebug.t.cpp b/tests/unit/ndebug.t.cpp
similarity index 95%
rename from tests/unit-tests/ndebug.t.cpp
rename to tests/unit/ndebug.t.cpp
index 05f510e..b7219c2 100644
--- a/tests/unit-tests/ndebug.t.cpp
+++ b/tests/unit/ndebug.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/net/collect-netifs.cpp b/tests/unit/net/collect-netifs.cpp
similarity index 97%
rename from tests/unit-tests/net/collect-netifs.cpp
rename to tests/unit/net/collect-netifs.cpp
index 51bd71e..ca8e6ef 100644
--- a/tests/unit-tests/net/collect-netifs.cpp
+++ b/tests/unit/net/collect-netifs.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California,
+ * Copyright (c) 2013-2018 Regents of the University of California,
  *                         Arizona Board of Regents,
  *                         Colorado State University,
  *                         University Pierre & Marie Curie, Sorbonne University,
diff --git a/tests/unit-tests/net/collect-netifs.hpp b/tests/unit/net/collect-netifs.hpp
similarity index 96%
rename from tests/unit-tests/net/collect-netifs.hpp
rename to tests/unit/net/collect-netifs.hpp
index c7e4e8f..322e323 100644
--- a/tests/unit-tests/net/collect-netifs.hpp
+++ b/tests/unit/net/collect-netifs.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California,
+ * Copyright (c) 2013-2018 Regents of the University of California,
  *                         Arizona Board of Regents,
  *                         Colorado State University,
  *                         University Pierre & Marie Curie, Sorbonne University,
diff --git a/tests/unit-tests/net/dns.t.cpp b/tests/unit/net/dns.t.cpp
similarity index 98%
rename from tests/unit-tests/net/dns.t.cpp
rename to tests/unit/net/dns.t.cpp
index 0e1aada..e4afa8e 100644
--- a/tests/unit-tests/net/dns.t.cpp
+++ b/tests/unit/net/dns.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/net/ethernet.t.cpp b/tests/unit/net/ethernet.t.cpp
similarity index 98%
rename from tests/unit-tests/net/ethernet.t.cpp
rename to tests/unit/net/ethernet.t.cpp
index cfcd6cb..4f76dbb 100644
--- a/tests/unit-tests/net/ethernet.t.cpp
+++ b/tests/unit/net/ethernet.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014-2017 Regents of the University of California,
+/*
+ * Copyright (c) 2014-2018 Regents of the University of California,
  *                         Arizona Board of Regents,
  *                         Colorado State University,
  *                         University Pierre & Marie Curie, Sorbonne University,
diff --git a/tests/unit-tests/net/face-uri.t.cpp b/tests/unit/net/face-uri.t.cpp
similarity index 100%
rename from tests/unit-tests/net/face-uri.t.cpp
rename to tests/unit/net/face-uri.t.cpp
diff --git a/tests/unit-tests/net/network-configuration-detector.cpp b/tests/unit/net/network-configuration-detector.cpp
similarity index 97%
rename from tests/unit-tests/net/network-configuration-detector.cpp
rename to tests/unit/net/network-configuration-detector.cpp
index 9aa196b..3e4f128 100644
--- a/tests/unit-tests/net/network-configuration-detector.cpp
+++ b/tests/unit/net/network-configuration-detector.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/net/network-configuration-detector.hpp b/tests/unit/net/network-configuration-detector.hpp
similarity index 96%
rename from tests/unit-tests/net/network-configuration-detector.hpp
rename to tests/unit/net/network-configuration-detector.hpp
index c039c52..58715c8 100644
--- a/tests/unit-tests/net/network-configuration-detector.hpp
+++ b/tests/unit/net/network-configuration-detector.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/net/network-monitor-stub.t.cpp b/tests/unit/net/network-monitor-stub.t.cpp
similarity index 98%
rename from tests/unit-tests/net/network-monitor-stub.t.cpp
rename to tests/unit/net/network-monitor-stub.t.cpp
index 03a1dc0..8fbf3eb 100644
--- a/tests/unit-tests/net/network-monitor-stub.t.cpp
+++ b/tests/unit/net/network-monitor-stub.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/net/network-monitor.t.cpp b/tests/unit/net/network-monitor.t.cpp
similarity index 96%
rename from tests/unit-tests/net/network-monitor.t.cpp
rename to tests/unit/net/network-monitor.t.cpp
index e46075b..b522ee6 100644
--- a/tests/unit-tests/net/network-monitor.t.cpp
+++ b/tests/unit/net/network-monitor.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/packet-base.t.cpp b/tests/unit/packet-base.t.cpp
similarity index 96%
rename from tests/unit-tests/packet-base.t.cpp
rename to tests/unit/packet-base.t.cpp
index 99b7e8a..8b4dfa2 100644
--- a/tests/unit-tests/packet-base.t.cpp
+++ b/tests/unit/packet-base.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/prefix-announcement.t.cpp b/tests/unit/prefix-announcement.t.cpp
similarity index 100%
rename from tests/unit-tests/prefix-announcement.t.cpp
rename to tests/unit/prefix-announcement.t.cpp
diff --git a/tests/unit-tests/security/command-interest-signer.t.cpp b/tests/unit/security/command-interest-signer.t.cpp
similarity index 100%
rename from tests/unit-tests/security/command-interest-signer.t.cpp
rename to tests/unit/security/command-interest-signer.t.cpp
diff --git a/tests/unit-tests/security/config-file-readme.txt b/tests/unit/security/config-file-readme.txt
similarity index 100%
rename from tests/unit-tests/security/config-file-readme.txt
rename to tests/unit/security/config-file-readme.txt
diff --git a/tests/unit-tests/security/digest-sha256.t.cpp b/tests/unit/security/digest-sha256.t.cpp
similarity index 97%
rename from tests/unit-tests/security/digest-sha256.t.cpp
rename to tests/unit/security/digest-sha256.t.cpp
index f3d7bb7..7c1d236 100644
--- a/tests/unit-tests/security/digest-sha256.t.cpp
+++ b/tests/unit/security/digest-sha256.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/key-params.t.cpp b/tests/unit/security/key-params.t.cpp
similarity index 100%
rename from tests/unit-tests/security/key-params.t.cpp
rename to tests/unit/security/key-params.t.cpp
diff --git a/tests/unit-tests/security/pib/certificate-container.t.cpp b/tests/unit/security/pib/certificate-container.t.cpp
similarity index 98%
rename from tests/unit-tests/security/pib/certificate-container.t.cpp
rename to tests/unit/security/pib/certificate-container.t.cpp
index 4eeaa4a..6614531 100644
--- a/tests/unit-tests/security/pib/certificate-container.t.cpp
+++ b/tests/unit/security/pib/certificate-container.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/pib/detail/identity-impl.t.cpp b/tests/unit/security/pib/detail/identity-impl.t.cpp
similarity index 98%
rename from tests/unit-tests/security/pib/detail/identity-impl.t.cpp
rename to tests/unit/security/pib/detail/identity-impl.t.cpp
index 0eaabdb..209a6b6 100644
--- a/tests/unit-tests/security/pib/detail/identity-impl.t.cpp
+++ b/tests/unit/security/pib/detail/identity-impl.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/pib/detail/key-impl.t.cpp b/tests/unit/security/pib/detail/key-impl.t.cpp
similarity index 100%
rename from tests/unit-tests/security/pib/detail/key-impl.t.cpp
rename to tests/unit/security/pib/detail/key-impl.t.cpp
diff --git a/tests/unit-tests/security/pib/identity-container.t.cpp b/tests/unit/security/pib/identity-container.t.cpp
similarity index 98%
rename from tests/unit-tests/security/pib/identity-container.t.cpp
rename to tests/unit/security/pib/identity-container.t.cpp
index 92420db..e821970 100644
--- a/tests/unit-tests/security/pib/identity-container.t.cpp
+++ b/tests/unit/security/pib/identity-container.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/pib/identity.t.cpp b/tests/unit/security/pib/identity.t.cpp
similarity index 97%
rename from tests/unit-tests/security/pib/identity.t.cpp
rename to tests/unit/security/pib/identity.t.cpp
index 6f631e5..d10c7bf 100644
--- a/tests/unit-tests/security/pib/identity.t.cpp
+++ b/tests/unit/security/pib/identity.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/pib/key-container.t.cpp b/tests/unit/security/pib/key-container.t.cpp
similarity index 98%
rename from tests/unit-tests/security/pib/key-container.t.cpp
rename to tests/unit/security/pib/key-container.t.cpp
index c04a415..2afd3e2 100644
--- a/tests/unit-tests/security/pib/key-container.t.cpp
+++ b/tests/unit/security/pib/key-container.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/pib/key.t.cpp b/tests/unit/security/pib/key.t.cpp
similarity index 98%
rename from tests/unit-tests/security/pib/key.t.cpp
rename to tests/unit/security/pib/key.t.cpp
index 2a90b9c..3c5d207 100644
--- a/tests/unit-tests/security/pib/key.t.cpp
+++ b/tests/unit/security/pib/key.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/pib/pib-data-fixture.cpp b/tests/unit/security/pib/pib-data-fixture.cpp
similarity index 100%
rename from tests/unit-tests/security/pib/pib-data-fixture.cpp
rename to tests/unit/security/pib/pib-data-fixture.cpp
diff --git a/tests/unit-tests/security/pib/pib-data-fixture.hpp b/tests/unit/security/pib/pib-data-fixture.hpp
similarity index 96%
rename from tests/unit-tests/security/pib/pib-data-fixture.hpp
rename to tests/unit/security/pib/pib-data-fixture.hpp
index aad5916..2328702 100644
--- a/tests/unit-tests/security/pib/pib-data-fixture.hpp
+++ b/tests/unit/security/pib/pib-data-fixture.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/pib/pib-impl.t.cpp b/tests/unit/security/pib/pib-impl.t.cpp
similarity index 100%
rename from tests/unit-tests/security/pib/pib-impl.t.cpp
rename to tests/unit/security/pib/pib-impl.t.cpp
diff --git a/tests/unit-tests/security/pib/pib-memory.t.cpp b/tests/unit/security/pib/pib-memory.t.cpp
similarity index 95%
rename from tests/unit-tests/security/pib/pib-memory.t.cpp
rename to tests/unit/security/pib/pib-memory.t.cpp
index 89cf198..72b0db8 100644
--- a/tests/unit-tests/security/pib/pib-memory.t.cpp
+++ b/tests/unit/security/pib/pib-memory.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/pib/pib-sqlite3.t.cpp b/tests/unit/security/pib/pib-sqlite3.t.cpp
similarity index 95%
rename from tests/unit-tests/security/pib/pib-sqlite3.t.cpp
rename to tests/unit/security/pib/pib-sqlite3.t.cpp
index 966926d..b46cb50 100644
--- a/tests/unit-tests/security/pib/pib-sqlite3.t.cpp
+++ b/tests/unit/security/pib/pib-sqlite3.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/pib/pib.t.cpp b/tests/unit/security/pib/pib.t.cpp
similarity index 98%
rename from tests/unit-tests/security/pib/pib.t.cpp
rename to tests/unit/security/pib/pib.t.cpp
index 5ae91b5..0ce5afc 100644
--- a/tests/unit-tests/security/pib/pib.t.cpp
+++ b/tests/unit/security/pib/pib.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/safe-bag.t.cpp b/tests/unit/security/safe-bag.t.cpp
similarity index 100%
rename from tests/unit-tests/security/safe-bag.t.cpp
rename to tests/unit/security/safe-bag.t.cpp
diff --git a/tests/unit-tests/security/signature-sha256-with-ecdsa.t.cpp b/tests/unit/security/signature-sha256-with-ecdsa.t.cpp
similarity index 100%
rename from tests/unit-tests/security/signature-sha256-with-ecdsa.t.cpp
rename to tests/unit/security/signature-sha256-with-ecdsa.t.cpp
diff --git a/tests/unit-tests/security/signature-sha256-with-rsa.t.cpp b/tests/unit/security/signature-sha256-with-rsa.t.cpp
similarity index 100%
rename from tests/unit-tests/security/signature-sha256-with-rsa.t.cpp
rename to tests/unit/security/signature-sha256-with-rsa.t.cpp
diff --git a/tests/unit-tests/security/signing-helpers.t.cpp b/tests/unit/security/signing-helpers.t.cpp
similarity index 96%
rename from tests/unit-tests/security/signing-helpers.t.cpp
rename to tests/unit/security/signing-helpers.t.cpp
index 0c608e7..af2c568 100644
--- a/tests/unit-tests/security/signing-helpers.t.cpp
+++ b/tests/unit/security/signing-helpers.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/signing-info.t.cpp b/tests/unit/security/signing-info.t.cpp
similarity index 100%
rename from tests/unit-tests/security/signing-info.t.cpp
rename to tests/unit/security/signing-info.t.cpp
diff --git a/tests/unit-tests/security/tmp-home/.ndn/client.conf b/tests/unit/security/tmp-home/.ndn/client.conf
similarity index 100%
rename from tests/unit-tests/security/tmp-home/.ndn/client.conf
rename to tests/unit/security/tmp-home/.ndn/client.conf
diff --git a/tests/unit-tests/security/tpm/back-end-wrapper-file.hpp b/tests/unit/security/tpm/back-end-wrapper-file.hpp
similarity index 100%
rename from tests/unit-tests/security/tpm/back-end-wrapper-file.hpp
rename to tests/unit/security/tpm/back-end-wrapper-file.hpp
diff --git a/tests/unit-tests/security/tpm/back-end-wrapper-mem.hpp b/tests/unit/security/tpm/back-end-wrapper-mem.hpp
similarity index 100%
rename from tests/unit-tests/security/tpm/back-end-wrapper-mem.hpp
rename to tests/unit/security/tpm/back-end-wrapper-mem.hpp
diff --git a/tests/unit-tests/security/tpm/back-end-wrapper-osx.hpp b/tests/unit/security/tpm/back-end-wrapper-osx.hpp
similarity index 100%
rename from tests/unit-tests/security/tpm/back-end-wrapper-osx.hpp
rename to tests/unit/security/tpm/back-end-wrapper-osx.hpp
diff --git a/tests/unit-tests/security/tpm/back-end.t.cpp b/tests/unit/security/tpm/back-end.t.cpp
similarity index 100%
rename from tests/unit-tests/security/tpm/back-end.t.cpp
rename to tests/unit/security/tpm/back-end.t.cpp
diff --git a/tests/unit-tests/security/transform.t.cpp b/tests/unit/security/transform.t.cpp
similarity index 97%
rename from tests/unit-tests/security/transform.t.cpp
rename to tests/unit/security/transform.t.cpp
index ab5d612..1d55464 100644
--- a/tests/unit-tests/security/transform.t.cpp
+++ b/tests/unit/security/transform.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/transform/base64-decode.t.cpp b/tests/unit/security/transform/base64-decode.t.cpp
similarity index 98%
rename from tests/unit-tests/security/transform/base64-decode.t.cpp
rename to tests/unit/security/transform/base64-decode.t.cpp
index a8c2dee..ecaa17c 100644
--- a/tests/unit-tests/security/transform/base64-decode.t.cpp
+++ b/tests/unit/security/transform/base64-decode.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/transform/base64-encode.t.cpp b/tests/unit/security/transform/base64-encode.t.cpp
similarity index 98%
rename from tests/unit-tests/security/transform/base64-encode.t.cpp
rename to tests/unit/security/transform/base64-encode.t.cpp
index f0df4e4..d52ac0b 100644
--- a/tests/unit-tests/security/transform/base64-encode.t.cpp
+++ b/tests/unit/security/transform/base64-encode.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/transform/block-cipher.t.cpp b/tests/unit/security/transform/block-cipher.t.cpp
similarity index 98%
rename from tests/unit-tests/security/transform/block-cipher.t.cpp
rename to tests/unit/security/transform/block-cipher.t.cpp
index 0803b44..379093d 100644
--- a/tests/unit-tests/security/transform/block-cipher.t.cpp
+++ b/tests/unit/security/transform/block-cipher.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/transform/bool-sink.t.cpp b/tests/unit/security/transform/bool-sink.t.cpp
similarity index 96%
rename from tests/unit-tests/security/transform/bool-sink.t.cpp
rename to tests/unit/security/transform/bool-sink.t.cpp
index 4683219..2ce633f 100644
--- a/tests/unit-tests/security/transform/bool-sink.t.cpp
+++ b/tests/unit/security/transform/bool-sink.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/transform/buffer-source.t.cpp b/tests/unit/security/transform/buffer-source.t.cpp
similarity index 97%
rename from tests/unit-tests/security/transform/buffer-source.t.cpp
rename to tests/unit/security/transform/buffer-source.t.cpp
index 151fd96..cb7e7f4 100644
--- a/tests/unit-tests/security/transform/buffer-source.t.cpp
+++ b/tests/unit/security/transform/buffer-source.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/transform/digest-filter.t.cpp b/tests/unit/security/transform/digest-filter.t.cpp
similarity index 100%
rename from tests/unit-tests/security/transform/digest-filter.t.cpp
rename to tests/unit/security/transform/digest-filter.t.cpp
diff --git a/tests/unit-tests/security/transform/hex-decode.t.cpp b/tests/unit/security/transform/hex-decode.t.cpp
similarity index 99%
rename from tests/unit-tests/security/transform/hex-decode.t.cpp
rename to tests/unit/security/transform/hex-decode.t.cpp
index d1e0af3..3c05ab4 100644
--- a/tests/unit-tests/security/transform/hex-decode.t.cpp
+++ b/tests/unit/security/transform/hex-decode.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/transform/hex-encode.t.cpp b/tests/unit/security/transform/hex-encode.t.cpp
similarity index 98%
rename from tests/unit-tests/security/transform/hex-encode.t.cpp
rename to tests/unit/security/transform/hex-encode.t.cpp
index 527fc75..26f6321 100644
--- a/tests/unit-tests/security/transform/hex-encode.t.cpp
+++ b/tests/unit/security/transform/hex-encode.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/transform/hmac-filter.t.cpp b/tests/unit/security/transform/hmac-filter.t.cpp
similarity index 97%
rename from tests/unit-tests/security/transform/hmac-filter.t.cpp
rename to tests/unit/security/transform/hmac-filter.t.cpp
index e1ae73d..1ed5e25 100644
--- a/tests/unit-tests/security/transform/hmac-filter.t.cpp
+++ b/tests/unit/security/transform/hmac-filter.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/transform/private-key.t.cpp b/tests/unit/security/transform/private-key.t.cpp
similarity index 99%
rename from tests/unit-tests/security/transform/private-key.t.cpp
rename to tests/unit/security/transform/private-key.t.cpp
index 76c541f..ee956f9 100644
--- a/tests/unit-tests/security/transform/private-key.t.cpp
+++ b/tests/unit/security/transform/private-key.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/transform/public-key.t.cpp b/tests/unit/security/transform/public-key.t.cpp
similarity index 98%
rename from tests/unit-tests/security/transform/public-key.t.cpp
rename to tests/unit/security/transform/public-key.t.cpp
index 20e071c..f9d3304 100644
--- a/tests/unit-tests/security/transform/public-key.t.cpp
+++ b/tests/unit/security/transform/public-key.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/transform/signer-filter.t.cpp b/tests/unit/security/transform/signer-filter.t.cpp
similarity index 98%
rename from tests/unit-tests/security/transform/signer-filter.t.cpp
rename to tests/unit/security/transform/signer-filter.t.cpp
index 5db93a7..51a98f0 100644
--- a/tests/unit-tests/security/transform/signer-filter.t.cpp
+++ b/tests/unit/security/transform/signer-filter.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/transform/step-source.t.cpp b/tests/unit/security/transform/step-source.t.cpp
similarity index 97%
rename from tests/unit-tests/security/transform/step-source.t.cpp
rename to tests/unit/security/transform/step-source.t.cpp
index 5e9567a..43c6655 100644
--- a/tests/unit-tests/security/transform/step-source.t.cpp
+++ b/tests/unit/security/transform/step-source.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/transform/stream-sink.t.cpp b/tests/unit/security/transform/stream-sink.t.cpp
similarity index 96%
rename from tests/unit-tests/security/transform/stream-sink.t.cpp
rename to tests/unit/security/transform/stream-sink.t.cpp
index e9185d3..753ea35 100644
--- a/tests/unit-tests/security/transform/stream-sink.t.cpp
+++ b/tests/unit/security/transform/stream-sink.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/transform/stream-source.t.cpp b/tests/unit/security/transform/stream-source.t.cpp
similarity index 97%
rename from tests/unit-tests/security/transform/stream-source.t.cpp
rename to tests/unit/security/transform/stream-source.t.cpp
index edce9f1..ae385b1 100644
--- a/tests/unit-tests/security/transform/stream-source.t.cpp
+++ b/tests/unit/security/transform/stream-source.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/transform/strip-space.t.cpp b/tests/unit/security/transform/strip-space.t.cpp
similarity index 97%
rename from tests/unit-tests/security/transform/strip-space.t.cpp
rename to tests/unit/security/transform/strip-space.t.cpp
index 431aed2..db8fa84 100644
--- a/tests/unit-tests/security/transform/strip-space.t.cpp
+++ b/tests/unit/security/transform/strip-space.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/transform/verifier-filter.t.cpp b/tests/unit/security/transform/verifier-filter.t.cpp
similarity index 98%
rename from tests/unit-tests/security/transform/verifier-filter.t.cpp
rename to tests/unit/security/transform/verifier-filter.t.cpp
index ae2f2ee..1b74690 100644
--- a/tests/unit-tests/security/transform/verifier-filter.t.cpp
+++ b/tests/unit/security/transform/verifier-filter.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/v2/additional-description.t.cpp b/tests/unit/security/v2/additional-description.t.cpp
similarity index 100%
rename from tests/unit-tests/security/v2/additional-description.t.cpp
rename to tests/unit/security/v2/additional-description.t.cpp
diff --git a/tests/unit-tests/security/v2/certificate-bundle-fetcher.t.cpp b/tests/unit/security/v2/certificate-bundle-fetcher.t.cpp
similarity index 100%
rename from tests/unit-tests/security/v2/certificate-bundle-fetcher.t.cpp
rename to tests/unit/security/v2/certificate-bundle-fetcher.t.cpp
diff --git a/tests/unit-tests/security/v2/certificate-cache.t.cpp b/tests/unit/security/v2/certificate-cache.t.cpp
similarity index 100%
rename from tests/unit-tests/security/v2/certificate-cache.t.cpp
rename to tests/unit/security/v2/certificate-cache.t.cpp
diff --git a/tests/unit-tests/security/v2/certificate-fetcher-direct-fetch.t.cpp b/tests/unit/security/v2/certificate-fetcher-direct-fetch.t.cpp
similarity index 100%
rename from tests/unit-tests/security/v2/certificate-fetcher-direct-fetch.t.cpp
rename to tests/unit/security/v2/certificate-fetcher-direct-fetch.t.cpp
diff --git a/tests/unit-tests/security/v2/certificate-fetcher-from-network.t.cpp b/tests/unit/security/v2/certificate-fetcher-from-network.t.cpp
similarity index 100%
rename from tests/unit-tests/security/v2/certificate-fetcher-from-network.t.cpp
rename to tests/unit/security/v2/certificate-fetcher-from-network.t.cpp
diff --git a/tests/unit-tests/security/v2/certificate-fetcher-offline.t.cpp b/tests/unit/security/v2/certificate-fetcher-offline.t.cpp
similarity index 97%
rename from tests/unit-tests/security/v2/certificate-fetcher-offline.t.cpp
rename to tests/unit/security/v2/certificate-fetcher-offline.t.cpp
index 652a7a2..102a308 100644
--- a/tests/unit-tests/security/v2/certificate-fetcher-offline.t.cpp
+++ b/tests/unit/security/v2/certificate-fetcher-offline.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/v2/certificate.t.cpp b/tests/unit/security/v2/certificate.t.cpp
similarity index 99%
rename from tests/unit-tests/security/v2/certificate.t.cpp
rename to tests/unit/security/v2/certificate.t.cpp
index 5e0e24f..e677aed 100644
--- a/tests/unit-tests/security/v2/certificate.t.cpp
+++ b/tests/unit/security/v2/certificate.t.cpp
@@ -24,7 +24,8 @@
 #include "security/v2/certificate.hpp"
 
 #include "boost-test.hpp"
-#include "unit-tests/unit-test-time-fixture.hpp"
+#include "../../unit-test-time-fixture.hpp"
+
 #include <boost/lexical_cast.hpp>
 
 namespace ndn {
diff --git a/tests/unit-tests/security/v2/key-chain.t.cpp b/tests/unit/security/v2/key-chain.t.cpp
similarity index 99%
rename from tests/unit-tests/security/v2/key-chain.t.cpp
rename to tests/unit/security/v2/key-chain.t.cpp
index 2bbc239..649ef7b 100644
--- a/tests/unit-tests/security/v2/key-chain.t.cpp
+++ b/tests/unit/security/v2/key-chain.t.cpp
@@ -24,8 +24,8 @@
 #include "security/verification-helpers.hpp"
 
 #include "boost-test.hpp"
-#include "unit-tests/test-home-env-saver.hpp"
 #include "identity-management-fixture.hpp"
+#include "../../test-home-env-saver.hpp"
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit-tests/security/v2/trust-anchor-container.t.cpp b/tests/unit/security/v2/trust-anchor-container.t.cpp
similarity index 100%
rename from tests/unit-tests/security/v2/trust-anchor-container.t.cpp
rename to tests/unit/security/v2/trust-anchor-container.t.cpp
diff --git a/tests/unit-tests/security/v2/validation-error.t.cpp b/tests/unit/security/v2/validation-error.t.cpp
similarity index 96%
rename from tests/unit-tests/security/v2/validation-error.t.cpp
rename to tests/unit/security/v2/validation-error.t.cpp
index aac7ca1..1db3aac 100644
--- a/tests/unit-tests/security/v2/validation-error.t.cpp
+++ b/tests/unit/security/v2/validation-error.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/v2/validation-policy-accept-all.t.cpp b/tests/unit/security/v2/validation-policy-accept-all.t.cpp
similarity index 97%
rename from tests/unit-tests/security/v2/validation-policy-accept-all.t.cpp
rename to tests/unit/security/v2/validation-policy-accept-all.t.cpp
index 5cefa9b..61466d6 100644
--- a/tests/unit-tests/security/v2/validation-policy-accept-all.t.cpp
+++ b/tests/unit/security/v2/validation-policy-accept-all.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/v2/validation-policy-command-interest.t.cpp b/tests/unit/security/v2/validation-policy-command-interest.t.cpp
similarity index 100%
rename from tests/unit-tests/security/v2/validation-policy-command-interest.t.cpp
rename to tests/unit/security/v2/validation-policy-command-interest.t.cpp
diff --git a/tests/unit-tests/security/v2/validation-policy-config.t.cpp b/tests/unit/security/v2/validation-policy-config.t.cpp
similarity index 100%
rename from tests/unit-tests/security/v2/validation-policy-config.t.cpp
rename to tests/unit/security/v2/validation-policy-config.t.cpp
diff --git a/tests/unit-tests/security/v2/validation-policy-simple-hierarchy.t.cpp b/tests/unit/security/v2/validation-policy-simple-hierarchy.t.cpp
similarity index 97%
rename from tests/unit-tests/security/v2/validation-policy-simple-hierarchy.t.cpp
rename to tests/unit/security/v2/validation-policy-simple-hierarchy.t.cpp
index cd8c466..8661ac5 100644
--- a/tests/unit-tests/security/v2/validation-policy-simple-hierarchy.t.cpp
+++ b/tests/unit/security/v2/validation-policy-simple-hierarchy.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/v2/validator-config/checker.t.cpp b/tests/unit/security/v2/validator-config/checker.t.cpp
similarity index 99%
rename from tests/unit-tests/security/v2/validator-config/checker.t.cpp
rename to tests/unit/security/v2/validator-config/checker.t.cpp
index 4b8d5ee..2170908 100644
--- a/tests/unit-tests/security/v2/validator-config/checker.t.cpp
+++ b/tests/unit/security/v2/validator-config/checker.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/v2/validator-config/common.hpp b/tests/unit/security/v2/validator-config/common.hpp
similarity index 95%
rename from tests/unit-tests/security/v2/validator-config/common.hpp
rename to tests/unit/security/v2/validator-config/common.hpp
index 4250718..231e8eb 100644
--- a/tests/unit-tests/security/v2/validator-config/common.hpp
+++ b/tests/unit/security/v2/validator-config/common.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/v2/validator-config/filter.t.cpp b/tests/unit/security/v2/validator-config/filter.t.cpp
similarity index 98%
rename from tests/unit-tests/security/v2/validator-config/filter.t.cpp
rename to tests/unit/security/v2/validator-config/filter.t.cpp
index 054b99a..fbd1264 100644
--- a/tests/unit-tests/security/v2/validator-config/filter.t.cpp
+++ b/tests/unit/security/v2/validator-config/filter.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/v2/validator-config/name-relation.t.cpp b/tests/unit/security/v2/validator-config/name-relation.t.cpp
similarity index 97%
rename from tests/unit-tests/security/v2/validator-config/name-relation.t.cpp
rename to tests/unit/security/v2/validator-config/name-relation.t.cpp
index cbe7084..157b55a 100644
--- a/tests/unit-tests/security/v2/validator-config/name-relation.t.cpp
+++ b/tests/unit/security/v2/validator-config/name-relation.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/v2/validator-config/rule.t.cpp b/tests/unit/security/v2/validator-config/rule.t.cpp
similarity index 100%
rename from tests/unit-tests/security/v2/validator-config/rule.t.cpp
rename to tests/unit/security/v2/validator-config/rule.t.cpp
diff --git a/tests/unit-tests/security/v2/validator-fixture.hpp b/tests/unit/security/v2/validator-fixture.hpp
similarity index 100%
rename from tests/unit-tests/security/v2/validator-fixture.hpp
rename to tests/unit/security/v2/validator-fixture.hpp
diff --git a/tests/unit-tests/security/v2/validator.t.cpp b/tests/unit/security/v2/validator.t.cpp
similarity index 100%
rename from tests/unit-tests/security/v2/validator.t.cpp
rename to tests/unit/security/v2/validator.t.cpp
diff --git a/tests/unit-tests/security/validator-config.t.cpp b/tests/unit/security/validator-config.t.cpp
similarity index 100%
rename from tests/unit-tests/security/validator-config.t.cpp
rename to tests/unit/security/validator-config.t.cpp
diff --git a/tests/unit-tests/security/validator-null.t.cpp b/tests/unit/security/validator-null.t.cpp
similarity index 97%
rename from tests/unit-tests/security/validator-null.t.cpp
rename to tests/unit/security/validator-null.t.cpp
index 07c317f..69cef48 100644
--- a/tests/unit-tests/security/validator-null.t.cpp
+++ b/tests/unit/security/validator-null.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/security/validity-period.t.cpp b/tests/unit/security/validity-period.t.cpp
similarity index 99%
rename from tests/unit-tests/security/validity-period.t.cpp
rename to tests/unit/security/validity-period.t.cpp
index 4c6fb6b..14d2a0f 100644
--- a/tests/unit-tests/security/validity-period.t.cpp
+++ b/tests/unit/security/validity-period.t.cpp
@@ -22,7 +22,8 @@
 #include "security/validity-period.hpp"
 
 #include "boost-test.hpp"
-#include "unit-tests/unit-test-time-fixture.hpp"
+#include "../unit-test-time-fixture.hpp"
+
 #include <boost/lexical_cast.hpp>
 
 namespace ndn {
diff --git a/tests/unit-tests/security/verification-helpers.t.cpp b/tests/unit/security/verification-helpers.t.cpp
similarity index 99%
rename from tests/unit-tests/security/verification-helpers.t.cpp
rename to tests/unit/security/verification-helpers.t.cpp
index 41aed81..d06580a 100644
--- a/tests/unit-tests/security/verification-helpers.t.cpp
+++ b/tests/unit/security/verification-helpers.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/selectors.t.cpp b/tests/unit/selectors.t.cpp
similarity index 100%
rename from tests/unit-tests/selectors.t.cpp
rename to tests/unit/selectors.t.cpp
diff --git a/tests/unit-tests/signature-info.t.cpp b/tests/unit/signature-info.t.cpp
similarity index 100%
rename from tests/unit-tests/signature-info.t.cpp
rename to tests/unit/signature-info.t.cpp
diff --git a/tests/unit-tests/signature.t.cpp b/tests/unit/signature.t.cpp
similarity index 96%
rename from tests/unit-tests/signature.t.cpp
rename to tests/unit/signature.t.cpp
index ecd2569..e4d8eff 100644
--- a/tests/unit-tests/signature.t.cpp
+++ b/tests/unit/signature.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/tag-host.t.cpp b/tests/unit/tag-host.t.cpp
similarity index 100%
rename from tests/unit-tests/tag-host.t.cpp
rename to tests/unit/tag-host.t.cpp
diff --git a/tests/unit-tests/tag.t.cpp b/tests/unit/tag.t.cpp
similarity index 95%
rename from tests/unit-tests/tag.t.cpp
rename to tests/unit/tag.t.cpp
index 994449a..9e5a20d 100644
--- a/tests/unit-tests/tag.t.cpp
+++ b/tests/unit/tag.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2015 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/test-home-env-saver.hpp b/tests/unit/test-home-env-saver.hpp
similarity index 95%
rename from tests/unit-tests/test-home-env-saver.hpp
rename to tests/unit/test-home-env-saver.hpp
index 9976b96..dc3d956 100644
--- a/tests/unit-tests/test-home-env-saver.hpp
+++ b/tests/unit/test-home-env-saver.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/transport/tcp-transport.t.cpp b/tests/unit/transport/tcp-transport.t.cpp
similarity index 100%
rename from tests/unit-tests/transport/tcp-transport.t.cpp
rename to tests/unit/transport/tcp-transport.t.cpp
diff --git a/tests/unit-tests/transport/transport-fixture.hpp b/tests/unit/transport/transport-fixture.hpp
similarity index 95%
rename from tests/unit-tests/transport/transport-fixture.hpp
rename to tests/unit/transport/transport-fixture.hpp
index 602ba5f..d25bb94 100644
--- a/tests/unit-tests/transport/transport-fixture.hpp
+++ b/tests/unit/transport/transport-fixture.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/transport/unix-transport.t.cpp b/tests/unit/transport/unix-transport.t.cpp
similarity index 100%
rename from tests/unit-tests/transport/unix-transport.t.cpp
rename to tests/unit/transport/unix-transport.t.cpp
diff --git a/tests/unit-tests/unit-test-time-fixture.hpp b/tests/unit/unit-test-time-fixture.hpp
similarity index 97%
rename from tests/unit-tests/unit-test-time-fixture.hpp
rename to tests/unit/unit-test-time-fixture.hpp
index 9f43258..b177145 100644
--- a/tests/unit-tests/unit-test-time-fixture.hpp
+++ b/tests/unit/unit-test-time-fixture.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/util/backports.t.cpp b/tests/unit/util/backports.t.cpp
similarity index 100%
rename from tests/unit-tests/util/backports.t.cpp
rename to tests/unit/util/backports.t.cpp
diff --git a/tests/unit-tests/util/concepts.t.cpp b/tests/unit/util/concepts.t.cpp
similarity index 96%
rename from tests/unit-tests/util/concepts.t.cpp
rename to tests/unit/util/concepts.t.cpp
index ea9542a..3141ec5 100644
--- a/tests/unit-tests/util/concepts.t.cpp
+++ b/tests/unit/util/concepts.t.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-2018 Regents of the University of California,
  *                         Arizona Board of Regents,
  *                         Colorado State University,
  *                         University Pierre & Marie Curie, Sorbonne University,
diff --git a/tests/unit-tests/util/config-file-home/.ndn/client.conf b/tests/unit/util/config-file-home/.ndn/client.conf
similarity index 100%
rename from tests/unit-tests/util/config-file-home/.ndn/client.conf
rename to tests/unit/util/config-file-home/.ndn/client.conf
diff --git a/tests/unit-tests/util/config-file-malformed-home/.ndn/client.conf b/tests/unit/util/config-file-malformed-home/.ndn/client.conf
similarity index 100%
rename from tests/unit-tests/util/config-file-malformed-home/.ndn/client.conf
rename to tests/unit/util/config-file-malformed-home/.ndn/client.conf
diff --git a/tests/unit-tests/util/config-file.t.cpp b/tests/unit/util/config-file.t.cpp
similarity index 87%
rename from tests/unit-tests/util/config-file.t.cpp
rename to tests/unit/util/config-file.t.cpp
index e72d0f2..658018b 100644
--- a/tests/unit-tests/util/config-file.t.cpp
+++ b/tests/unit/util/config-file.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -36,7 +36,7 @@
 {
   namespace fs = boost::filesystem;
 
-  setenv("TEST_HOME", "tests/unit-tests/util/config-file-home", 1);
+  setenv("TEST_HOME", "tests/unit/util/config-file-home", 1);
 
   fs::path homePath(fs::absolute(std::getenv("TEST_HOME")));
   homePath /= ".ndn/client.conf";
@@ -51,14 +51,14 @@
 
 BOOST_AUTO_TEST_CASE(ParseEmptyPath)
 {
-  setenv("TEST_HOME", "tests/unit-tests/util/does/not/exist", 1);
+  setenv("TEST_HOME", "tests/unit/util/does/not/exist", 1);
 
   BOOST_CHECK_NO_THROW(ConfigFile config);
 }
 
 BOOST_AUTO_TEST_CASE(ParseMalformed)
 {
-  setenv("TEST_HOME", "tests/unit-tests/util/config-file-malformed-home", 1);
+  setenv("TEST_HOME", "tests/unit/util/config-file-malformed-home", 1);
 
   BOOST_CHECK_THROW(ConfigFile config, ConfigFile::Error);
 }
diff --git a/tests/unit-tests/util/dummy-client-face.t.cpp b/tests/unit/util/dummy-client-face.t.cpp
similarity index 100%
rename from tests/unit-tests/util/dummy-client-face.t.cpp
rename to tests/unit/util/dummy-client-face.t.cpp
diff --git a/tests/unit-tests/util/indented-stream.t.cpp b/tests/unit/util/indented-stream.t.cpp
similarity index 100%
rename from tests/unit-tests/util/indented-stream.t.cpp
rename to tests/unit/util/indented-stream.t.cpp
diff --git a/tests/unit-tests/util/io.t.cpp b/tests/unit/util/io.t.cpp
similarity index 100%
rename from tests/unit-tests/util/io.t.cpp
rename to tests/unit/util/io.t.cpp
diff --git a/tests/unit-tests/util/log-filter-module.cpp b/tests/unit/util/log-filter-module.cpp
similarity index 95%
rename from tests/unit-tests/util/log-filter-module.cpp
rename to tests/unit/util/log-filter-module.cpp
index 4086b84..cf3b628 100644
--- a/tests/unit-tests/util/log-filter-module.cpp
+++ b/tests/unit/util/log-filter-module.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/util/log-module1.cpp b/tests/unit/util/log-module1.cpp
similarity index 94%
rename from tests/unit-tests/util/log-module1.cpp
rename to tests/unit/util/log-module1.cpp
index 9641ef2..2099a75 100644
--- a/tests/unit-tests/util/log-module1.cpp
+++ b/tests/unit/util/log-module1.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/util/log-module2.cpp b/tests/unit/util/log-module2.cpp
similarity index 94%
rename from tests/unit-tests/util/log-module2.cpp
rename to tests/unit/util/log-module2.cpp
index 37e86d0..273165d 100644
--- a/tests/unit-tests/util/log-module2.cpp
+++ b/tests/unit/util/log-module2.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/util/logger.t.cpp b/tests/unit/util/logger.t.cpp
similarity index 97%
rename from tests/unit-tests/util/logger.t.cpp
rename to tests/unit/util/logger.t.cpp
index 1443178..cc48425 100644
--- a/tests/unit-tests/util/logger.t.cpp
+++ b/tests/unit/util/logger.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/util/logging.t.cpp b/tests/unit/util/logging.t.cpp
similarity index 100%
rename from tests/unit-tests/util/logging.t.cpp
rename to tests/unit/util/logging.t.cpp
diff --git a/tests/unit-tests/util/notification-stream.t.cpp b/tests/unit/util/notification-stream.t.cpp
similarity index 100%
rename from tests/unit-tests/util/notification-stream.t.cpp
rename to tests/unit/util/notification-stream.t.cpp
diff --git a/tests/unit-tests/util/notification-subscriber.t.cpp b/tests/unit/util/notification-subscriber.t.cpp
similarity index 100%
rename from tests/unit-tests/util/notification-subscriber.t.cpp
rename to tests/unit/util/notification-subscriber.t.cpp
diff --git a/tests/unit-tests/util/placeholders.t.cpp b/tests/unit/util/placeholders.t.cpp
similarity index 95%
rename from tests/unit-tests/util/placeholders.t.cpp
rename to tests/unit/util/placeholders.t.cpp
index 64c1dbf..0dc8c70 100644
--- a/tests/unit-tests/util/placeholders.t.cpp
+++ b/tests/unit/util/placeholders.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/util/placeholders2.t.cpp b/tests/unit/util/placeholders2.t.cpp
similarity index 94%
rename from tests/unit-tests/util/placeholders2.t.cpp
rename to tests/unit/util/placeholders2.t.cpp
index ada739a..187daa9 100644
--- a/tests/unit-tests/util/placeholders2.t.cpp
+++ b/tests/unit/util/placeholders2.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2015 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/util/random.t.cpp b/tests/unit/util/random.t.cpp
similarity index 95%
rename from tests/unit-tests/util/random.t.cpp
rename to tests/unit/util/random.t.cpp
index 62949b6..e830f7b 100644
--- a/tests/unit-tests/util/random.t.cpp
+++ b/tests/unit/util/random.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -20,11 +20,11 @@
  */
 
 #include "util/random.hpp"
-
-#include "boost-test.hpp"
-#include <boost/mpl/vector.hpp>
 #include "security/detail/openssl.hpp"
 
+#include "boost-test.hpp"
+
+#include <boost/mpl/vector.hpp>
 #include <cmath>
 
 namespace ndn {
@@ -172,7 +172,7 @@
 #endif // OPENSSL_VERSION_NUMBER < 0x1010000fL
 
   static int
-  bytes(unsigned char *buf, int num)
+  bytes(unsigned char* buf, int num)
   {
     return 0;
   }
@@ -184,19 +184,19 @@
 
 #if OPENSSL_VERSION_NUMBER < 0x1010000fL
   static void
-  add(const void *buf, int num, double entropy)
+  add(const void* buf, int num, double entropy)
   {
   }
 #else
   static int
-  add(const void *buf, int num, double entropy)
+  add(const void* buf, int num, double entropy)
   {
     return 0;
   }
 #endif // OPENSSL_VERSION_NUMBER < 0x1010000fL
 
   static int
-  pseudorand(unsigned char *buf, int num)
+  pseudorand(unsigned char* buf, int num)
   {
     return 0;
   }
diff --git a/tests/unit-tests/util/regex.t.cpp b/tests/unit/util/regex.t.cpp
similarity index 99%
rename from tests/unit-tests/util/regex.t.cpp
rename to tests/unit/util/regex.t.cpp
index d8f47bf..777defb 100644
--- a/tests/unit-tests/util/regex.t.cpp
+++ b/tests/unit/util/regex.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/unit-tests/util/scheduler.t.cpp b/tests/unit/util/scheduler.t.cpp
similarity index 100%
rename from tests/unit-tests/util/scheduler.t.cpp
rename to tests/unit/util/scheduler.t.cpp
diff --git a/tests/unit-tests/util/segment-fetcher.t.cpp b/tests/unit/util/segment-fetcher.t.cpp
similarity index 100%
rename from tests/unit-tests/util/segment-fetcher.t.cpp
rename to tests/unit/util/segment-fetcher.t.cpp
diff --git a/tests/unit-tests/util/sha256.t.cpp b/tests/unit/util/sha256.t.cpp
similarity index 100%
rename from tests/unit-tests/util/sha256.t.cpp
rename to tests/unit/util/sha256.t.cpp
diff --git a/tests/unit-tests/util/signal.t.cpp b/tests/unit/util/signal.t.cpp
similarity index 100%
rename from tests/unit-tests/util/signal.t.cpp
rename to tests/unit/util/signal.t.cpp
diff --git a/tests/unit-tests/util/simple-notification.hpp b/tests/unit/util/simple-notification.hpp
similarity index 97%
rename from tests/unit-tests/util/simple-notification.hpp
rename to tests/unit/util/simple-notification.hpp
index 084a5f2..9e0d4ed 100644
--- a/tests/unit-tests/util/simple-notification.hpp
+++ b/tests/unit/util/simple-notification.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014-2017 Regents of the University of California,
+/*
+ * Copyright (c) 2014-2018 Regents of the University of California,
  *                         Arizona Board of Regents,
  *                         Colorado State University,
  *                         University Pierre & Marie Curie, Sorbonne University,
diff --git a/tests/unit-tests/util/sqlite3-statement.t.cpp b/tests/unit/util/sqlite3-statement.t.cpp
similarity index 100%
rename from tests/unit-tests/util/sqlite3-statement.t.cpp
rename to tests/unit/util/sqlite3-statement.t.cpp
diff --git a/tests/unit-tests/util/string-helper.t.cpp b/tests/unit/util/string-helper.t.cpp
similarity index 100%
rename from tests/unit-tests/util/string-helper.t.cpp
rename to tests/unit/util/string-helper.t.cpp
diff --git a/tests/unit-tests/util/time-unit-test-clock.t.cpp b/tests/unit/util/time-unit-test-clock.t.cpp
similarity index 100%
rename from tests/unit-tests/util/time-unit-test-clock.t.cpp
rename to tests/unit/util/time-unit-test-clock.t.cpp
diff --git a/tests/unit-tests/util/time.t.cpp b/tests/unit/util/time.t.cpp
similarity index 100%
rename from tests/unit-tests/util/time.t.cpp
rename to tests/unit/util/time.t.cpp
diff --git a/tests/unit-tests/version.t.cpp b/tests/unit/version.t.cpp
similarity index 96%
rename from tests/unit-tests/version.t.cpp
rename to tests/unit/version.t.cpp
index 5cb6622..7fdb50d 100644
--- a/tests/unit-tests/version.t.cpp
+++ b/tests/unit/version.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
diff --git a/tests/wscript b/tests/wscript
index 20c49da..22e0416 100644
--- a/tests/wscript
+++ b/tests/wscript
@@ -3,7 +3,7 @@
 top = '..'
 
 def build(bld):
-    # core objects that can be shared between unit and integrated tests
+    # common objects that can be shared between unit and integrated tests
     bld.objects(target='tests-base',
                 features='pch',
                 source=bld.path.ant_glob('*.cpp', excl=['main.cpp']),
@@ -15,13 +15,14 @@
     config_path = 'UNIT_TEST_CONFIG_PATH="%s"' % bld.bldnode.make_node('tmp-files')
 
     # unit test objects
-    src = bld.path.ant_glob('unit-tests/**/*.cpp',
-                            excl=['**/*-osx.t.cpp', '**/*-sqlite3.t.cpp'])
+    src = bld.path.ant_glob('unit/**/*.cpp', excl=['**/*-osx.t.cpp',
+                                                   '**/*-sqlite3.t.cpp'])
+
     if bld.env['HAVE_OSX_FRAMEWORKS']:
-        src += bld.path.ant_glob('unit-tests/**/*-osx.t.cpp')
+        src += bld.path.ant_glob('unit/**/*-osx.t.cpp')
 
     # In case we want to make it optional later
-    src += bld.path.ant_glob('unit-tests/**/*-sqlite3.t.cpp')
+    src += bld.path.ant_glob('unit/**/*-sqlite3.t.cpp')
 
     bld.objects(target='unit-tests-objects',
                 source=src,