diff --git a/libraries/io/i2c/hdllib.cfg b/libraries/io/i2c/hdllib.cfg
index 573eb297548caae802b6b81e380b7c849fd6a244..f844cd8696bdada99af7ed351fe271dc0b0d7117 100644
--- a/libraries/io/i2c/hdllib.cfg
+++ b/libraries/io/i2c/hdllib.cfg
@@ -41,3 +41,7 @@ test_bench_files =
     $UNB/Firmware/modules/Lofar/i2c/tb/vhdl/tb_i2c_master.vhd
     $UNB/Firmware/modules/Lofar/i2c/tb/vhdl/tb_avs_i2c_master.vhd
     $UNB/Firmware/modules/Lofar/i2c/tb/vhdl/tb_i2c_commander.vhd
+    tb/vhdl/tb_tb_i2c_commander.vhd
+
+modelsim_copy_files =
+    $UNB/Firmware/modules/Lofar/i2c/tb/data data
diff --git a/libraries/io/i2c/tb/vhdl/tb_tb_i2c_commander.vhd b/libraries/io/i2c/tb/vhdl/tb_tb_i2c_commander.vhd
new file mode 100644
index 0000000000000000000000000000000000000000..eb6eae507d44f30154d4fefb05985e87fbf9f440
--- /dev/null
+++ b/libraries/io/i2c/tb/vhdl/tb_tb_i2c_commander.vhd
@@ -0,0 +1,46 @@
+-------------------------------------------------------------------------------
+--
+-- Copyright (C) 2010
+-- 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 i2c_commander
+-- Description:
+--   Verify i2c_commander for I2C slaves on different board busses
+-- Usage:
+--   > as 3
+--   > run -all
+
+LIBRARY IEEE;
+USE IEEE.std_logic_1164.ALL;
+
+ENTITY tb_tb_i2c_commander IS
+END tb_tb_i2c_commander;
+
+
+ARCHITECTURE tb OF tb_tb_i2c_commander IS
+  
+BEGIN
+
+  -- g_board      : STRING := "adu"  -- else default to "unb"
+  
+  u_adu : ENTITY work.tb_i2c_commander GENERIC MAP ("adu");
+  u_unb : ENTITY work.tb_i2c_commander GENERIC MAP ("unb");
+  
+END tb;