diff --git a/src/bin/netconf/tests/get_config_unittest.cc b/src/bin/netconf/tests/get_config_unittest.cc
index a6b1734963..fd5c2e6a9e 100644
--- a/src/bin/netconf/tests/get_config_unittest.cc
+++ b/src/bin/netconf/tests/get_config_unittest.cc
@@ -8,11 +8,14 @@
 
 #include <cc/data.h>
 #include <cc/command_interpreter.h>
+#include <testutils/gtest_utils.h>
 #include <testutils/user_context_utils.h>
 #include <process/testutils/d_test_stubs.h>
 #include <netconf/netconf_cfg_mgr.h>
 #include <netconf/parser_context.h>
+
 #include <boost/scoped_ptr.hpp>
+
 #include <gtest/gtest.h>
 
 #include <iostream>
diff --git a/src/bin/netconf/tests/netconf_cfg_mgr_unittests.cc b/src/bin/netconf/tests/netconf_cfg_mgr_unittests.cc
index 4b50a8178e..1ec7b877bc 100644
--- a/src/bin/netconf/tests/netconf_cfg_mgr_unittests.cc
+++ b/src/bin/netconf/tests/netconf_cfg_mgr_unittests.cc
@@ -5,6 +5,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <config.h>
+
 #include <netconf/netconf_cfg_mgr.h>
 #include <netconf/parser_context.h>
 #include <exceptions/exceptions.h>
@@ -12,9 +13,12 @@
 #include <process/testutils/d_test_stubs.h>
 #include <process/d_cfg_mgr.h>
 #include <yang/yang_models.h>
+#include <testutils/gtest_utils.h>
 #include <testutils/test_to_element.h>
 #include <netconf/tests/test_libraries.h>
+
 #include <boost/scoped_ptr.hpp>
+
 #include <gtest/gtest.h>
 
 using namespace std;
diff --git a/src/bin/netconf/tests/netconf_controller_unittests.cc b/src/bin/netconf/tests/netconf_controller_unittests.cc
index 8159ea22b9..dd4cb85ad0 100644
--- a/src/bin/netconf/tests/netconf_controller_unittests.cc
+++ b/src/bin/netconf/tests/netconf_controller_unittests.cc
@@ -11,7 +11,10 @@
 #include <netconf/netconf_process.h>
 #include <cc/data.h>
 #include <process/testutils/d_test_stubs.h>
+#include <testutils/gtest_utils.h>
+
 #include <boost/pointer_cast.hpp>
+
 #include <sstream>
 
 using namespace isc::asiolink::test;
diff --git a/src/bin/netconf/tests/netconf_process_unittests.cc b/src/bin/netconf/tests/netconf_process_unittests.cc
index 9cce4cf485..08d2d3cd53 100644
--- a/src/bin/netconf/tests/netconf_process_unittests.cc
+++ b/src/bin/netconf/tests/netconf_process_unittests.cc
@@ -5,13 +5,18 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <config.h>
+
 #include <netconf/netconf_cfg_mgr.h>
 #include <netconf/netconf_process.h>
 #include <asiolink/interval_timer.h>
 #include <asiolink/io_service.h>
 #include <process/testutils/d_test_stubs.h>
+#include <testutils/gtest_utils.h>
+
 #include <boost/date_time/posix_time/posix_time.hpp>
+
 #include <gtest/gtest.h>
+
 #include <functional>
 
 using namespace boost::posix_time;
diff --git a/src/bin/netconf/tests/parser_unittests.cc b/src/bin/netconf/tests/parser_unittests.cc
index 1788716ee1..a282b35133 100644
--- a/src/bin/netconf/tests/parser_unittests.cc
+++ b/src/bin/netconf/tests/parser_unittests.cc
@@ -9,9 +9,12 @@
 #include <cc/data.h>
 #include <netconf/parser_context.h>
 #include <cc/dhcp_config_error.h>
+#include <testutils/gtest_utils.h>
 #include <testutils/io_utils.h>
 #include <testutils/user_context_utils.h>
+
 #include <gtest/gtest.h>
+
 #include <fstream>
 #include <set>
 
diff --git a/src/lib/yang/tests/adaptor_config_unittests.cc b/src/lib/yang/tests/adaptor_config_unittests.cc
index 9f350d1686..7935b05732 100644
--- a/src/lib/yang/tests/adaptor_config_unittests.cc
+++ b/src/lib/yang/tests/adaptor_config_unittests.cc
@@ -6,10 +6,10 @@
 
 #include <config.h>
 
-#include <yang/adaptor_config.h>
-
+#include <testutils/gtest_utils.h>
 #include <testutils/io_utils.h>
 #include <testutils/user_context_utils.h>
+#include <yang/adaptor_config.h>
 
 #include <gtest/gtest.h>
 
diff --git a/src/lib/yang/tests/adaptor_option_unittests.cc b/src/lib/yang/tests/adaptor_option_unittests.cc
index e4a3f738d9..1b23f05e30 100644
--- a/src/lib/yang/tests/adaptor_option_unittests.cc
+++ b/src/lib/yang/tests/adaptor_option_unittests.cc
@@ -6,11 +6,12 @@
 
 #include <config.h>
 
-#include <yang/adaptor_option.h>
 #include <dhcp/dhcp4.h>
 #include <dhcp/dhcp6.h>
 #include <dhcp/option_data_types.h>
 #include <dhcp/option_space.h>
+#include <testutils/gtest_utils.h>
+#include <yang/adaptor_option.h>
 
 #include <gtest/gtest.h>
 
diff --git a/src/lib/yang/tests/adaptor_pool_unittests.cc b/src/lib/yang/tests/adaptor_pool_unittests.cc
index 5325c6b077..dd707168e2 100644
--- a/src/lib/yang/tests/adaptor_pool_unittests.cc
+++ b/src/lib/yang/tests/adaptor_pool_unittests.cc
@@ -6,6 +6,7 @@
 
 #include <config.h>
 
+#include <testutils/gtest_utils.h>
 #include <yang/adaptor_pool.h>
 #include <yang/yang_models.h>
 
diff --git a/src/lib/yang/tests/adaptor_subnet_unittests.cc b/src/lib/yang/tests/adaptor_subnet_unittests.cc
index e8605aa08f..54ec71094d 100644
--- a/src/lib/yang/tests/adaptor_subnet_unittests.cc
+++ b/src/lib/yang/tests/adaptor_subnet_unittests.cc
@@ -6,6 +6,7 @@
 
 #include <config.h>
 
+#include <testutils/gtest_utils.h>
 #include <yang/adaptor_subnet.h>
 
 #include <gtest/gtest.h>
diff --git a/src/lib/yang/tests/adaptor_unittests.cc b/src/lib/yang/tests/adaptor_unittests.cc
index c06b272657..fc75ad16f8 100644
--- a/src/lib/yang/tests/adaptor_unittests.cc
+++ b/src/lib/yang/tests/adaptor_unittests.cc
@@ -6,6 +6,7 @@
 
 #include <config.h>
 
+#include <testutils/gtest_utils.h>
 #include <yang/adaptor.h>
 
 #include <gtest/gtest.h>