diff --git a/providers/ovsdb/tunnel/src/test/java/org/onosproject/ovsdb/provider/tunnel/OvsdbTunnelProviderTest.java b/providers/ovsdb/tunnel/src/test/java/org/onosproject/ovsdb/provider/tunnel/OvsdbTunnelProviderTest.java
index 3d1549e..03642f4 100644
--- a/providers/ovsdb/tunnel/src/test/java/org/onosproject/ovsdb/provider/tunnel/OvsdbTunnelProviderTest.java
+++ b/providers/ovsdb/tunnel/src/test/java/org/onosproject/ovsdb/provider/tunnel/OvsdbTunnelProviderTest.java
@@ -55,6 +55,13 @@
     private final TestTunnelRegistry tunnelRegistry = new TestTunnelRegistry();
     private TestTunnelProviderService providerService;
 
+    Link link = DefaultLink.builder()
+            .providerId(this.provider.id())
+            .src(ConnectPoint.deviceConnectPoint("192.168.2.3/20"))
+            .dst(ConnectPoint.deviceConnectPoint("192.168.2.4/30"))
+            .type(Link.Type.DIRECT)
+            .build();
+
     @Before
     public void setUp() {
         provider.providerRegistry = tunnelRegistry;
@@ -75,11 +82,7 @@
                 .valueOf("192.168.1.3"));
         SparseAnnotations annotations = DefaultAnnotations.builder()
                 .set("bandwidth", "1024").build();
-        Link link = new DefaultLink(
-                                    this.provider.id(),
-                                    ConnectPoint.deviceConnectPoint("192.168.2.3/20"),
-                                    ConnectPoint.deviceConnectPoint("192.168.2.4/30"),
-                                    Link.Type.DIRECT);
+
         List<Link> links = new ArrayList<Link>();
         links.add(link);
         TunnelDescription tunnel = new DefaultTunnelDescription(
@@ -104,11 +107,7 @@
                 .valueOf("192.168.1.3"));
         SparseAnnotations annotations = DefaultAnnotations.builder()
                 .set("bandwidth", "1024").build();
-        Link link = new DefaultLink(
-                                    this.provider.id(),
-                                    ConnectPoint.deviceConnectPoint("192.168.2.3/20"),
-                                    ConnectPoint.deviceConnectPoint("192.168.2.4/30"),
-                                    Link.Type.DIRECT);
+
         List<Link> links = new ArrayList<Link>();
         links.add(link);
         TunnelDescription tunnel = new DefaultTunnelDescription(
diff --git a/providers/pcep/tunnel/src/main/java/org/onosproject/provider/pcep/tunnel/impl/PcepTunnelProvider.java b/providers/pcep/tunnel/src/main/java/org/onosproject/provider/pcep/tunnel/impl/PcepTunnelProvider.java
index 648e500..d1bae5b 100644
--- a/providers/pcep/tunnel/src/main/java/org/onosproject/provider/pcep/tunnel/impl/PcepTunnelProvider.java
+++ b/providers/pcep/tunnel/src/main/java/org/onosproject/provider/pcep/tunnel/impl/PcepTunnelProvider.java
@@ -480,9 +480,12 @@
 
     // Short-hand for creating a link.
     private Link link(PcepDpid src, long sp, PcepDpid dst, long dp) {
-        return new DefaultLink(id(), connectPoint(src, sp), connectPoint(dst,
-                                                                         dp),
-                               Link.Type.TUNNEL);
+        return DefaultLink.builder()
+                .providerId(id())
+                .src(connectPoint(src, sp))
+                .dst(connectPoint(dst, dp))
+                .type(Link.Type.TUNNEL)
+                .build();
     }
 
     // Creates a path that leads through the given devices.
@@ -1132,7 +1135,12 @@
                     } else {
                         IpAddress dstIp = IpAddress.valueOf(ipv4SubObj.getIpAddress());
                         dst = new ConnectPoint(IpElementId.ipElement(dstIp), PortNumber.portNumber(0));
-                        Link link = new DefaultLink(providerId, src, dst, Link.Type.DIRECT, EMPTY);
+                        Link link = DefaultLink.builder()
+                                .providerId(providerId)
+                                .src(src)
+                                .dst(dst)
+                                .type(Link.Type.DIRECT)
+                                .build();
                         links.add(link);
                         src = dst;
                     }
diff --git a/providers/pcep/tunnel/src/test/java/org/onosproject/provider/pcep/tunnel/impl/PcepReleaseTunnelProviderTest.java b/providers/pcep/tunnel/src/test/java/org/onosproject/provider/pcep/tunnel/impl/PcepReleaseTunnelProviderTest.java
index e386138..fe08778 100644
--- a/providers/pcep/tunnel/src/test/java/org/onosproject/provider/pcep/tunnel/impl/PcepReleaseTunnelProviderTest.java
+++ b/providers/pcep/tunnel/src/test/java/org/onosproject/provider/pcep/tunnel/impl/PcepReleaseTunnelProviderTest.java
@@ -84,7 +84,8 @@
 
         ConnectPoint dst = new ConnectPoint(dstElementId, PortNumber.portNumber(10023));
 
-        Link link = new DefaultLink(pid, src, dst, Link.Type.DIRECT, EMPTY);
+        Link link = DefaultLink.builder().providerId(pid).src(src).dst(dst)
+                .type(Link.Type.DIRECT).build();
         links.add(link);
 
         path = new DefaultPath(pid, links, 20, EMPTY);
diff --git a/providers/pcep/tunnel/src/test/java/org/onosproject/provider/pcep/tunnel/impl/PcepSetupTunnelProviderTest.java b/providers/pcep/tunnel/src/test/java/org/onosproject/provider/pcep/tunnel/impl/PcepSetupTunnelProviderTest.java
index ef4816e..0a84dce 100644
--- a/providers/pcep/tunnel/src/test/java/org/onosproject/provider/pcep/tunnel/impl/PcepSetupTunnelProviderTest.java
+++ b/providers/pcep/tunnel/src/test/java/org/onosproject/provider/pcep/tunnel/impl/PcepSetupTunnelProviderTest.java
@@ -80,7 +80,8 @@
 
         ConnectPoint dst = new ConnectPoint(dstElementId, PortNumber.portNumber(10023));
 
-        Link link = new DefaultLink(pid, src, dst, Link.Type.DIRECT, EMPTY);
+        Link link = DefaultLink.builder().providerId(pid).src(src).dst(dst)
+                .type(Link.Type.DIRECT).build();
         links.add(link);
 
         path = new DefaultPath(pid, links, 10, EMPTY);
diff --git a/providers/pcep/tunnel/src/test/java/org/onosproject/provider/pcep/tunnel/impl/PcepTunnelProviderTest.java b/providers/pcep/tunnel/src/test/java/org/onosproject/provider/pcep/tunnel/impl/PcepTunnelProviderTest.java
index 0fcd144..a4c7098 100644
--- a/providers/pcep/tunnel/src/test/java/org/onosproject/provider/pcep/tunnel/impl/PcepTunnelProviderTest.java
+++ b/providers/pcep/tunnel/src/test/java/org/onosproject/provider/pcep/tunnel/impl/PcepTunnelProviderTest.java
@@ -79,7 +79,8 @@
 
         ConnectPoint dst = new ConnectPoint(dstElementId, PortNumber.portNumber(10023));
 
-        Link link = new DefaultLink(pid, src, dst, Link.Type.DIRECT, EMPTY);
+        Link link = DefaultLink.builder().providerId(pid).src(src).dst(dst)
+                .type(Link.Type.DIRECT).build();
         links.add(link);
 
         path = new DefaultPath(pid, links, 10, EMPTY);
diff --git a/providers/pcep/tunnel/src/test/java/org/onosproject/provider/pcep/tunnel/impl/PcepUpdateTunnelProviderTest.java b/providers/pcep/tunnel/src/test/java/org/onosproject/provider/pcep/tunnel/impl/PcepUpdateTunnelProviderTest.java
index 1bcf99d..1a0f1b7 100644
--- a/providers/pcep/tunnel/src/test/java/org/onosproject/provider/pcep/tunnel/impl/PcepUpdateTunnelProviderTest.java
+++ b/providers/pcep/tunnel/src/test/java/org/onosproject/provider/pcep/tunnel/impl/PcepUpdateTunnelProviderTest.java
@@ -83,7 +83,8 @@
 
         ConnectPoint dst = new ConnectPoint(dstElementId, PortNumber.portNumber(10023));
 
-        Link link = new DefaultLink(pid, src, dst, Link.Type.DIRECT, EMPTY);
+        Link link = DefaultLink.builder().providerId(pid).src(src).dst(dst)
+                .type(Link.Type.DIRECT).build();
         links.add(link);
 
         path = new DefaultPath(pid, links, 20, EMPTY);