diff --git a/libraries/io/eth/hdllib.cfg b/libraries/io/eth/hdllib.cfg
index ef1c6c3e818aec9615a54bacacc8a8add5a43ac5..6829b8993c415f7086d0efc6cd149b2147008911 100644
--- a/libraries/io/eth/hdllib.cfg
+++ b/libraries/io/eth/hdllib.cfg
@@ -29,7 +29,10 @@ test_bench_files =
     $UNB/Firmware/modules/tse/tb/vhdl/tb_eth_hdr.vhd
     tb/vhdl/tb_eth.vhd
     tb/vhdl/tb_tb_eth.vhd
-    tb/vhdl/tb_tb_tb_eth.vhd
     tb/vhdl/tb_eth_udp_offload.vhd
     tb/vhdl/tb_eth_ihl_to_20.vhd
     tb/vhdl/tb_tb_tb_eth_regression.vhd
+
+modelsim_search_libraries =
+    altera_ver lpm_ver sgate_ver altera_mf_ver altera_lnsim_ver stratixiv_ver stratixiv_hssi_ver stratixiv_pcie_hip_ver twentynm_ver twentynm_hssi_ver twentynm_hip_ver
+    altera     lpm     sgate     altera_mf     altera_lnsim     stratixiv     stratixiv_hssi     stratixiv_pcie_hip     twentynm     twentynm_hssi     twentynm_hip
diff --git a/libraries/io/eth/tb/vhdl/tb_tb_tb_eth.vhd b/libraries/io/eth/tb/vhdl/tb_tb_tb_eth.vhd
deleted file mode 100644
index 211daeab9f87c026a850253c24af51c61cf4e19b..0000000000000000000000000000000000000000
--- a/libraries/io/eth/tb/vhdl/tb_tb_tb_eth.vhd
+++ /dev/null
@@ -1,46 +0,0 @@
--------------------------------------------------------------------------------
---
--- Copyright (C) 2014
--- ASTRON (Netherlands Institute for Radio Astronomy) <http://www.astron.nl/>
--- JIVE (Joint Institute for VLBI in Europe) <http://www.jive.nl/>
--- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
---
--- This program is free software: you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License
--- along with this program.  If not, see <http://www.gnu.org/licenses/>.
---
--------------------------------------------------------------------------------
-
--- Purpose: Multi-testbench for eth
--- Description:
---   Verify eth for different technologies
--- Usage:
---   > as 3
---   > run -all
-
-LIBRARY IEEE, technology_lib, tech_tse_lib;
-USE IEEE.std_logic_1164.ALL;
-USE WORK.eth_pkg.ALL;
-USE technology_lib.technology_pkg.ALL;
-
-
-ENTITY tb_tb_tb_eth IS
-END tb_tb_tb_eth;
-
-
-ARCHITECTURE tb OF tb_tb_tb_eth IS
-
-BEGIN
-
-  u_dut_stratixiv : ENTITY work.tb_tb_eth GENERIC MAP (c_tech_stratixiv);
-  
-END tb;
diff --git a/libraries/io/eth/tb/vhdl/tb_tb_tb_eth_regression.vhd b/libraries/io/eth/tb/vhdl/tb_tb_tb_eth_regression.vhd
index 58931265bc116289948386dea6b40cafbdbc0654..1addbeb8624e65802b4d65992e87213586bb76bc 100644
--- a/libraries/io/eth/tb/vhdl/tb_tb_tb_eth_regression.vhd
+++ b/libraries/io/eth/tb/vhdl/tb_tb_tb_eth_regression.vhd
@@ -35,7 +35,7 @@ END tb_tb_tb_eth_regression;
 ARCHITECTURE tb OF tb_tb_tb_eth_regression IS
 BEGIN
 
-  u_tb_tb_tb_eth       : ENTITY work.tb_tb_tb_eth;
+  u_tb_tb_eth          : ENTITY work.tb_tb_eth;
   u_tb_eth_hdr         : ENTITY work.tb_eth_hdr;
   u_tb_eth_checksum    : ENTITY work.tb_eth_checksum;
   u_tb_eth_crc_ctrl    : ENTITY work.tb_eth_crc_ctrl;