diff --git a/libraries/base/diag/hdllib.cfg b/libraries/base/diag/hdllib.cfg
index 18df3bdaa63f7f67560e1975ec7a0aeeb06c38e7..9c2da2f578e84f40bfb9867257f61160e16bf048 100644
--- a/libraries/base/diag/hdllib.cfg
+++ b/libraries/base/diag/hdllib.cfg
@@ -33,16 +33,16 @@ synth_files =
 test_bench_files = 
     $UNB/Firmware/modules/Lofar/diag/tb/vhdl/tb_diag_wg.vhd
     $UNB/Firmware/modules/Lofar/diag/tb/vhdl/tb_diag_wg_wideband.vhd
-    $UNB/Firmware/modules/Lofar/diag/tb/vhdl/tb_diag_block_gen.vhd
     $UNB/Firmware/modules/Lofar/diag/tb/vhdl/tb_diag_tx_seq.vhd
     $UNB/Firmware/modules/Lofar/diag/tb/vhdl/tb_diag_rx_seq.vhd
     $UNB/Firmware/modules/Lofar/diag/tb/vhdl/tb_diag_tx_frm.vhd
     $UNB/Firmware/modules/Lofar/diag/tb/vhdl/tb_diag_frm_generator.vhd
     $UNB/Firmware/modules/Lofar/diag/tb/vhdl/tb_diag_frm_monitor.vhd
     $UNB/Firmware/modules/Lofar/diag/tb/vhdl/tb_mms_diag_seq.vhd
-    $UNB/Firmware/modules/Lofar/diag/tb/vhdl/tb_mms_diag_block_gen.vhd
+    tb/vhdl/tb_diag_block_gen.vhd
+    tb/vhdl/tb_mms_diag_block_gen.vhd
     tb/vhdl/tb_diag_regression.vhd
 
 modelsim_copy_files =
-    $UNB/Firmware/modules/Lofar/diag/src/data/bf_in_data.dat .
-    $UNB/Firmware/modules/Lofar/diag/src/data/diag_block.hex .
\ No newline at end of file
+    $UNB/Firmware/modules/Lofar/diag/src/data data
+    
\ No newline at end of file
diff --git a/libraries/base/diag/src/vhdl/mms_diag_block_gen.vhd b/libraries/base/diag/src/vhdl/mms_diag_block_gen.vhd
index 19640ccb71e9eb2f57f42dc50f58ccf0d3fdd710..47e66fdee3b9e906ab4377e4fb2ac37079bfec40 100644
--- a/libraries/base/diag/src/vhdl/mms_diag_block_gen.vhd
+++ b/libraries/base/diag/src/vhdl/mms_diag_block_gen.vhd
@@ -48,7 +48,7 @@ ENTITY mms_diag_block_gen IS
     g_buf_dat_w          : POSITIVE := 32; 
     g_buf_addr_w         : POSITIVE := 7;                         -- Waveform buffer size 2**g_buf_addr_w nof samples
     g_file_index_arr     : t_nat_natural_arr := array_init(0, 128, 1);  -- default use the instance index as file index 0, 1, 2, 3, 4 ...
-    g_file_name_prefix   : STRING   := "../../data/bf_in_data";   -- Relative path to the hex files that contain the initial data for the memories 
+    g_file_name_prefix   : STRING   := "data/bf_in_data";   -- Path to the hex files that contain the initial data for the memories 
                                                                   -- The sequence number and ".hex" are added within the entity.
     g_diag_block_gen_rst : t_diag_block_gen := c_diag_block_gen_rst
   );
diff --git a/libraries/base/diag/tb/vhdl/tb_diag_block_gen.vhd b/libraries/base/diag/tb/vhdl/tb_diag_block_gen.vhd
index 9c7d3d5353ea66b718f56d90ab8397a5be77892b..9338804f348c41bb87ec38be1e42f20ca05332b0 100644
--- a/libraries/base/diag/tb/vhdl/tb_diag_block_gen.vhd
+++ b/libraries/base/diag/tb/vhdl/tb_diag_block_gen.vhd
@@ -56,7 +56,7 @@ ARCHITECTURE tb OF tb_diag_block_gen IS
                                           nof_dat  => 2**g_buf_adr_w,  -- = 2**adr_w
                                           init_sl  => '0');
                                           
-  CONSTANT c_buf_file   : STRING := sel_a_b(c_buf.adr_w=7 AND c_buf.dat_w=32, "diag_block.hex", "UNUSED");
+  CONSTANT c_buf_file   : STRING := sel_a_b(c_buf.adr_w=7 AND c_buf.dat_w=32, "data/diag_block.hex", "UNUSED");
   
   CONSTANT c_cntr_init  : INTEGER := 0;
   CONSTANT c_cntr_incr  : INTEGER := 1;
diff --git a/libraries/base/diag/tb/vhdl/tb_mms_diag_block_gen.vhd b/libraries/base/diag/tb/vhdl/tb_mms_diag_block_gen.vhd
index 4dacecd9470f95a20c49787eece3df9b172b9420..a7400b622d203a66e7773655bac9e7d985ee9dcf 100644
--- a/libraries/base/diag/tb/vhdl/tb_mms_diag_block_gen.vhd
+++ b/libraries/base/diag/tb/vhdl/tb_mms_diag_block_gen.vhd
@@ -46,7 +46,7 @@ ENTITY tb_mms_diag_block_gen IS
     g_nof_streams      : NATURAL  := 16;
     g_buf_dat_w        : NATURAL  := 32; 
     g_buf_addr_w       : NATURAL  := 7;
-    g_file_name_prefix : STRING   := "bf_in_data"; 
+    g_file_name_prefix : STRING   := "data/bf_in_data"; 
     g_sim              : BOOLEAN  := TRUE
   );
 END tb_mms_diag_block_gen;