diff --git a/MAINTAINERS b/MAINTAINERS
index 158d503f6f6..2dad16d69e6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -496,6 +496,12 @@ I:	mdata
 M:	Dave Barach <dave@barachs.net>
 F:	src/plugins/mdata/
 
+Plugin - Unit Tests
+I:	unittest
+M:	Dave Barach <dave@barachs.net>
+M:	Florin Coras <fcoras@cisco.com
+F:	src/plugins/unittest/
+
 Test Infrastructure
 I:	tests
 M:	Klement Sekera <ksekera@cisco.com>
diff --git a/src/plugins/unittest/bihash_test.c b/src/plugins/unittest/bihash_test.c
index 03524033884..c5cc752ade0 100644
--- a/src/plugins/unittest/bihash_test.c
+++ b/src/plugins/unittest/bihash_test.c
@@ -549,6 +549,7 @@ bihash_test_init (vlib_main_t * vm)
 {
   bihash_test_main_t *tm = &bihash_test_main;
 
+  clib_time_init (&tm->clib_time);
   tm->vlib_main = vm;
   return (0);
 }