diff --git a/ovs-p4rt/sidecar/tests/common/CMakeLists.txt b/ovs-p4rt/sidecar/tests/common/CMakeLists.txt
index ecb16ae6..e0684958 100644
--- a/ovs-p4rt/sidecar/tests/common/CMakeLists.txt
+++ b/ovs-p4rt/sidecar/tests/common/CMakeLists.txt
@@ -24,6 +24,8 @@ if(BUILD_CLIENT)
 define_basic_test(config_fdb_rx_vlan_table_entry_test)
 define_basic_test(config_fdb_tx_vlan_table_entry_test)
 
+define_mac_learn_info_test(config_fdb_tunnel_table_entry_test)
+
 define_tunnel_info_test(config_encap_table_entry_test)
 define_tunnel_info_test(config_tunnel_term_entry_test)
 
diff --git a/ovs-p4rt/sidecar/tests/es2k/client/config_fdb_tunnel_table_entry_test.cc b/ovs-p4rt/sidecar/tests/common/config_fdb_tunnel_table_entry_test.cc
similarity index 100%
rename from ovs-p4rt/sidecar/tests/es2k/client/config_fdb_tunnel_table_entry_test.cc
rename to ovs-p4rt/sidecar/tests/common/config_fdb_tunnel_table_entry_test.cc
diff --git a/ovs-p4rt/sidecar/tests/es2k/client/CMakeLists.txt b/ovs-p4rt/sidecar/tests/es2k/client/CMakeLists.txt
index 599993d6..0b348a8a 100644
--- a/ovs-p4rt/sidecar/tests/es2k/client/CMakeLists.txt
+++ b/ovs-p4rt/sidecar/tests/es2k/client/CMakeLists.txt
@@ -24,7 +24,6 @@ define_basic_test(es2k_update_tunnel_info_test)
 #-----------------------------------------------------------------------
 # mac_learn_info tests
 #-----------------------------------------------------------------------
-define_mac_learn_info_test(config_fdb_tunnel_table_entry_test)
 define_mac_learn_info_test(es2k_config_l2_tunnel_table_entry_test)
 define_mac_learn_info_test(es2k_prep_l2_tunnel_table_entry)
 define_mac_learn_info_test(es2k_prep_fdb_table_v4_tunnel_test)