diff --git a/apps/vpls/src/test/java/org/onosproject/vpls/VplsOperationManagerTest.java b/apps/vpls/src/test/java/org/onosproject/vpls/VplsOperationManagerTest.java
index 36ffda9..56f07d6 100644
--- a/apps/vpls/src/test/java/org/onosproject/vpls/VplsOperationManagerTest.java
+++ b/apps/vpls/src/test/java/org/onosproject/vpls/VplsOperationManagerTest.java
@@ -34,6 +34,7 @@
 import org.onosproject.net.intent.IntentData;
 import org.onosproject.net.intent.IntentEvent;
 import org.onosproject.net.intent.IntentState;
+import org.onosproject.net.intent.MockIdGenerator;
 import org.onosproject.store.service.WallClockTimestamp;
 import org.onosproject.vpls.api.VplsData;
 import org.onosproject.vpls.api.VplsOperation;
@@ -58,11 +59,7 @@
 
     @Before
     public void setup() {
-        if (idGenerator == null) {
-            idGenerator = new TestIdGenerator();
-        }
-        Intent.unbindIdGenerator(idGenerator);
-        Intent.bindIdGenerator(idGenerator);
+        MockIdGenerator.cleanBind();
         vplsOperationManager = new VplsOperationManager();
         vplsOperationManager.coreService = new TestCoreService();
         vplsOperationManager.intentService = new TestIntentService();
@@ -76,6 +73,7 @@
 
     @After
     public void tearDown() {
+        MockIdGenerator.unbind();
         vplsOperationManager.deactivate();
     }