diff --git a/apps/bgprouter/src/main/java/org/onosproject/bgprouter/BgpRouter.java b/apps/bgprouter/src/main/java/org/onosproject/bgprouter/BgpRouter.java
index 44d6640..975beeb 100644
--- a/apps/bgprouter/src/main/java/org/onosproject/bgprouter/BgpRouter.java
+++ b/apps/bgprouter/src/main/java/org/onosproject/bgprouter/BgpRouter.java
@@ -67,6 +67,14 @@
 import java.util.Map;
 import java.util.Set;
 
+/* For test only - will be removed before Cardinal release
+import org.onlab.packet.Ip4Address;
+import org.onlab.packet.Ip4Prefix;
+import org.onlab.packet.MacAddress;
+import java.util.Collections;
+import static org.onlab.util.Tools.delay;
+*/
+
 /**
  * BgpRouter component.
  */