diff --git a/apps/vpls/src/test/java/org/onosproject/vpls/VplsIntentTest.java b/apps/vpls/src/test/java/org/onosproject/vpls/VplsIntentTest.java
index 7ee9292..3c10000 100644
--- a/apps/vpls/src/test/java/org/onosproject/vpls/VplsIntentTest.java
+++ b/apps/vpls/src/test/java/org/onosproject/vpls/VplsIntentTest.java
@@ -40,6 +40,7 @@
 import org.onosproject.net.intent.IntentServiceAdapter;
 import org.onosproject.net.intent.IntentUtils;
 import org.onosproject.net.intent.Key;
+import org.onosproject.net.intent.MockIdGenerator;
 import org.onosproject.net.intent.MultiPointToSinglePointIntent;
 import org.onosproject.net.intent.SinglePointToMultiPointIntent;
 import org.onosproject.vpls.api.VplsData;
@@ -73,9 +74,7 @@
 
     @Before
     public void setUp() throws Exception {
-        idGenerator = new TestIdGenerator();
-        Intent.unbindIdGenerator(idGenerator);
-        Intent.bindIdGenerator(idGenerator);
+        MockIdGenerator.cleanBind();
         hostsAvailable = Sets.newHashSet();
         intentService = new TestIntentService();
         interfaceService = createMock(InterfaceService.class);
@@ -86,7 +85,7 @@
 
     @After
     public void tearDown() {
-        Intent.unbindIdGenerator(idGenerator);
+        MockIdGenerator.unbind();
     }
 
     /**