diff --git a/libraries/io/nw_10GbE/tb/vhdl/tb_nw_arp_request.vhd b/libraries/io/nw_10GbE/tb/vhdl/tb_nw_arp_request.vhd
index 950aedd237ca96781c34831b29d3124098ea8cb4..3667db15d7f60afcec442318552a856f66c82d16 100644
--- a/libraries/io/nw_10GbE/tb/vhdl/tb_nw_arp_request.vhd
+++ b/libraries/io/nw_10GbE/tb/vhdl/tb_nw_arp_request.vhd
@@ -79,6 +79,9 @@ BEGIN
     src_in.ready <= '1';
     proc_common_wait_until_evt(clk, src_out.eop);
     tb_end <= '1';
+    -- End with WAIT to avoid Warning: (vcom-1090) Possible infinite loop:
+    -- Process contains no WAIT statement.
+    WAIT;
   END PROCESS;
 
   dut: ENTITY work.nw_arp_request
diff --git a/libraries/io/nw_10GbE/tb/vhdl/tb_nw_ping_response.vhd b/libraries/io/nw_10GbE/tb/vhdl/tb_nw_ping_response.vhd
index 0f38f4ae42540a7d0a57eb17e156bf3d5bbe9795..b2bd80c4f2cc2c79a29db3d2122713e51cee8f06 100644
--- a/libraries/io/nw_10GbE/tb/vhdl/tb_nw_ping_response.vhd
+++ b/libraries/io/nw_10GbE/tb/vhdl/tb_nw_ping_response.vhd
@@ -186,6 +186,9 @@ BEGIN
       proc_common_wait_until_evt(clk, nw_ping_response_src_out.eop);
     END LOOP;
     tb_end <= '1';
+    -- End with WAIT to avoid Warning: (vcom-1090) Possible infinite loop:
+    -- Process contains no WAIT statement.
+    WAIT;
   END PROCESS;
 
   nw_ping_response_src_in.xon <= '1';