diff --git a/test/feature/feature_env_setup.tcl b/test/feature/feature_env_setup.tcl
index 53bed6bc7d142898c2e66453924fa25997536972..81a0e8c7c1ed15ac2eaff3b18948bcebad677043 100644
--- a/test/feature/feature_env_setup.tcl
+++ b/test/feature/feature_env_setup.tcl
@@ -89,6 +89,11 @@ add wave -group "RX Buffer (1)" \
 	-label "Write pointer" -unsigned $TCOMP/$INST1/rx_write_pointer_pos \
 	-label "Data overrun" -unsigned $TCOMP/$INST1/rx_data_overrun
 
+add wave -group "Interrupt manager (1)" \
+	-label "Interrupt vector" $TCOMP/$INST1/int_vector \
+	-label "Interrupt enable" $TCOMP/$INST1/int_ena \
+	-label "Interrupt mask" $TCOMP/$INST1/int_mask
+
 add wave -group "Frame to transmit (1)" \
 	-label "Frame is valid" $TCOMP/$INST1/tran_frame_valid_out \
 	-label "data" -hexadecimal $TCOMP/$INST1/tran_data_out \
@@ -169,11 +174,11 @@ add wave -group "Bus sampling (1)" \
 add wave -noupdate -divider -height 20 "Node 2"
 quietly set INST1 "can_inst_2"
 
-add wave -label "Memory bus" $TCOMP/mem_bus_1
-add wave -label "CAN_TX" $TCOMP/can_tx_1
-add wave -label "CAN_RX" $TCOMP/can_rx_1
-add wave -label "Interrupt" $TCOMP/int_1
-add wave -label "Transciever delay" $TCOMP/tr_del_1
+add wave -label "Memory bus" $TCOMP/mem_bus_2
+add wave -label "CAN_TX" $TCOMP/can_tx_2
+add wave -label "CAN_RX" $TCOMP/can_rx_2
+add wave -label "Interrupt" $TCOMP/int_2
+add wave -label "Transciever delay" $TCOMP/tr_del_2
 add wave -label "Driving bus" $TCOMP/$INST1/drv_bus
 add wave -label "Status bus" $TCOMP/$INST1/stat_bus
 								
@@ -188,6 +193,11 @@ add wave -group "RX Buffer (2)" \
 	-label "Write pointer" -unsigned $TCOMP/$INST1/rx_write_pointer_pos \
 	-label "Data overrun" -unsigned $TCOMP/$INST1/rx_data_overrun
 
+add wave -group "Interrupt manager (2)" \
+	-label "Interrupt vector" $TCOMP/$INST1/int_vector \
+	-label "Interrupt enable" $TCOMP/$INST1/int_ena \
+	-label "Interrupt mask" $TCOMP/$INST1/int_mask
+
 add wave -group "Frame to transmit (2)" \
 	-label "Frame is valid" $TCOMP/$INST1/tran_frame_valid_out \
 	-label "data" -hexadecimal $TCOMP/$INST1/tran_data_out \