diff --git a/libraries/base/reorder/hdllib.cfg b/libraries/base/reorder/hdllib.cfg
index 063dedb9b1d6564bd45e278e71070493e1196c05..d7fa2674a8ec6283693d91a54b40528c8abddaf9 100644
--- a/libraries/base/reorder/hdllib.cfg
+++ b/libraries/base/reorder/hdllib.cfg
@@ -59,10 +59,12 @@ test_bench_files =
     tb/vhdl/tb_mmf_reorder_row.vhd
     tb/vhdl/tb_mms_reorder_rewire.vhd
     tb/vhdl/tb_reorder_col_select_all.vhd
+    tb/vhdl/tb_tb_reorder_col_select_all.vhd
 
 regression_test_vhdl =
     tb/vhdl/tb_tb_reorder_col_wide_row_select.vhd
     tb/vhdl/tb_tb_reorder_col.vhd
+    tb/vhdl/tb_tb_reorder_col_select_all.vhd
 
 
 [modelsim_project_file]
diff --git a/libraries/base/reorder/tb/vhdl/tb_tb_reorder_col_select_all.vhd b/libraries/base/reorder/tb/vhdl/tb_tb_reorder_col_select_all.vhd
new file mode 100644
index 0000000000000000000000000000000000000000..98be137f91e7e015ae26b6329fe3e45f96968219
--- /dev/null
+++ b/libraries/base/reorder/tb/vhdl/tb_tb_reorder_col_select_all.vhd
@@ -0,0 +1,54 @@
+-------------------------------------------------------------------------------
+--
+-- Copyright 2021
+-- ASTRON (Netherlands Institute for Radio Astronomy) <http://www.astron.nl/>
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-------------------------------------------------------------------------------
+
+-------------------------------------------------------------------------------
+-- Author : E. Kooistra
+-- Purpose: Verify multiple variations of tb_reorder_col_select_all
+-- Description:
+-- Usage:
+-- > as 3
+-- > run -all
+-------------------------------------------------------------------------------
+
+library IEEE;
+use IEEE.std_logic_1164.all;
+
+entity tb_tb_reorder_col_select_all is
+end tb_tb_reorder_col_select_all;
+
+architecture tb of tb_tb_reorder_col_select_all is
+  signal tb_end : std_logic := '0';  -- declare tb_end to avoid 'No objects found' error on 'when -label tb_end'
+begin
+
+-- g_dsp_data_w            : natural := 16;  -- complex data width, = c_data_w / 2
+-- g_nof_sync              : natural := 1;
+-- g_nof_packets_per_sync  : natural := 3;
+-- g_nof_blocks_per_packet : natural := 5;
+-- g_nof_data_per_block    : natural := 3;
+-- g_inter_packet_gap      : natural := 0;
+-- g_use_complex           : boolean := false
+
+  u_complex_5_3_no_gaps    : entity work.tb_reorder_col_select_all generic map(16, 3, 2, 5, 3, 0, true);
+  u_data_5_3_no_gaps       : entity work.tb_reorder_col_select_all generic map(16, 3, 3, 5, 3, 0, false);
+  u_data_5_1_no_gaps       : entity work.tb_reorder_col_select_all generic map(16, 3, 4, 5, 1, 0, false);
+  u_data_1_3_no_gaps       : entity work.tb_reorder_col_select_all generic map(16, 3, 5, 1, 3, 0, false);
+  u_data_3_5_gap_1         : entity work.tb_reorder_col_select_all generic map(16, 3, 6, 3, 5, 1, false);
+
+end tb;