diff --git a/src/vnet/udp/udp.c b/src/vnet/udp/udp.c
index 7147fa3..4932750 100644
--- a/src/vnet/udp/udp.c
+++ b/src/vnet/udp/udp.c
@@ -364,7 +364,8 @@
   if (rv)
     return rv;
 
-  if (udp_is_valid_dst_port (lcl_port, rmt->is_ip4))
+  if (udp_connection_port_used_extern (clib_net_to_host_u16 (lcl_port),
+				       rmt->is_ip4))
     {
       /* If specific source port was requested abort */
       if (rmt->peer.port)
@@ -375,7 +376,8 @@
 	}
 
       /* Try to find a port that's not used */
-      while (udp_is_valid_dst_port (lcl_port, rmt->is_ip4))
+      while (udp_connection_port_used_extern (clib_net_to_host_u16 (lcl_port),
+					      rmt->is_ip4))
 	{
 	  transport_release_local_endpoint (TRANSPORT_PROTO_UDP, &lcl_addr,
 					    lcl_port);
diff --git a/test/asf/test_vcl.py b/test/asf/test_vcl.py
index 9853529..59c077e 100644
--- a/test/asf/test_vcl.py
+++ b/test/asf/test_vcl.py
@@ -996,6 +996,7 @@
             "-t 2",
             "-u",
             "-l 1400",
+            "-P 2",
             "-c",
             self.loop0.local_ip4,
         ]