diff --git a/libraries/base/diag/tb/vhdl/tb_tb_diag_rx_seq.vhd b/libraries/base/diag/tb/vhdl/tb_tb_diag_rx_seq.vhd
index 23a520a906be7ce7ffdccb7e484912dd18da1582..bde41661563b1674fe21f2b898e3b3928024997f 100644
--- a/libraries/base/diag/tb/vhdl/tb_tb_diag_rx_seq.vhd
+++ b/libraries/base/diag/tb/vhdl/tb_tb_diag_rx_seq.vhd
@@ -28,6 +28,7 @@ END tb_tb_diag_rx_seq;
 
 
 ARCHITECTURE tb OF tb_tb_diag_rx_seq IS
+  SIGNAL tb_end : STD_LOGIC := '0';  -- declare tb_end to avoid 'No objects found' error on 'when -label tb_end'
 BEGIN
 
   -- g_tx_cnt_incr    : INTEGER := 1;
diff --git a/libraries/base/diag/tb/vhdl/tb_tb_mms_diag_block_gen.vhd b/libraries/base/diag/tb/vhdl/tb_tb_mms_diag_block_gen.vhd
index 50cb4d8ac957e255277891f0036f22415f733a92..27816064e04a67e390653882a92ed957966ef3da 100644
--- a/libraries/base/diag/tb/vhdl/tb_tb_mms_diag_block_gen.vhd
+++ b/libraries/base/diag/tb/vhdl/tb_tb_mms_diag_block_gen.vhd
@@ -39,6 +39,8 @@ ARCHITECTURE tb OF tb_tb_mms_diag_block_gen IS
   
   CONSTANT c_nof_repeat : NATURAL := 2;
   
+  SIGNAL tb_end : STD_LOGIC := '0';  -- declare tb_end to avoid 'No objects found' error on 'when -label tb_end'
+  
 BEGIN
 
 -- g_use_usr_input        : BOOLEAN := TRUE;
diff --git a/libraries/base/diag/tb/vhdl/tb_tb_mms_diag_seq.vhd b/libraries/base/diag/tb/vhdl/tb_tb_mms_diag_seq.vhd
index 8f3476158f84d6fc3495d6ebb7e9b6e2cbd206fd..b72449e3bf819a9b43d57afbda0a3e34f47ab5af 100644
--- a/libraries/base/diag/tb/vhdl/tb_tb_mms_diag_seq.vhd
+++ b/libraries/base/diag/tb/vhdl/tb_tb_mms_diag_seq.vhd
@@ -29,6 +29,7 @@ END tb_tb_mms_diag_seq;
 
 
 ARCHITECTURE tb OF tb_tb_mms_diag_seq IS
+  SIGNAL tb_end : STD_LOGIC := '0';  -- declare tb_end to avoid 'No objects found' error on 'when -label tb_end'
 BEGIN
 
   -- g_flow_control_verify  : t_dp_flow_control_enum := e_active;  -- always active or random flow control