5 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/unittest/CMakeLists.txt b/src/plugins/unittest/CMakeLists.txt
index 72ed8e35d81..3e98d2a71e5 100644
--- a/src/plugins/unittest/CMakeLists.txt
+++ b/src/plugins/unittest/CMakeLists.txt
@@ -13,7 +13,10 @@
 
 add_vpp_plugin(unittest
   SOURCES
+  bier_test.c
   bihash_test.c
+  fib_test.c
+  mfib_test.c
   session_test.c
   string_test.c
   tcp_test.c
diff --git a/src/vnet/bier/bier_test.c b/src/plugins/unittest/bier_test.c
index d15ee595b64..d15ee595b64 100644
--- a/src/vnet/bier/bier_test.c
+++ b/src/plugins/unittest/bier_test.c
diff --git a/src/vnet/fib/fib_test.c b/src/plugins/unittest/fib_test.c
index e26cc674a88..e26cc674a88 100644
--- a/src/vnet/fib/fib_test.c
+++ b/src/plugins/unittest/fib_test.c
diff --git a/src/vnet/mfib/mfib_test.c b/src/plugins/unittest/mfib_test.c
index fda02580bee..fda02580bee 100644
--- a/src/vnet/mfib/mfib_test.c
+++ b/src/plugins/unittest/mfib_test.c
diff --git a/src/vnet/CMakeLists.txt b/src/vnet/CMakeLists.txt
index a258b54207f..62bd57582b4 100644
--- a/src/vnet/CMakeLists.txt
+++ b/src/vnet/CMakeLists.txt
@@ -1162,7 +1162,6 @@ list(APPEND VNET_API_FILES unix/tap.api)
 
 list(APPEND VNET_SOURCES
   fib/fib.c
-  fib/fib_test.c
   fib/ip4_fib.c
   fib/ip6_fib.c
   fib/mpls_fib.c
@@ -1273,7 +1272,6 @@ list(APPEND VNET_HEADERS
 ##############################################################################
 
 list(APPEND VNET_SOURCES
-  mfib/mfib_test.c
   mfib/mfib_forward.c
   mfib/ip4_mfib.c
   mfib/ip6_mfib.c
@@ -1333,7 +1331,6 @@ list(APPEND VNET_SOURCES
   bier/bier_output.c
   bier/bier_table.c
   bier/bier_types.c
-  bier/bier_test.c
   bier/bier_api.c
   bier/bier_drop.c
   bier/bier_update.c