diff --git a/providers/lisp/device/BUCK b/providers/lisp/device/BUCK
index 14d1d09..153579f 100644
--- a/providers/lisp/device/BUCK
+++ b/providers/lisp/device/BUCK
@@ -5,6 +5,7 @@
 
 TEST_DEPS = [
     '//lib:TEST_ADAPTERS',
+    '//protocols/lisp/api:onos-protocols-lisp-api-tests',
 ]
 
 osgi_jar_with_tests (
diff --git a/providers/lisp/device/pom.xml b/providers/lisp/device/pom.xml
index 1416189..ce064c4 100644
--- a/providers/lisp/device/pom.xml
+++ b/providers/lisp/device/pom.xml
@@ -38,11 +38,6 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-lisp-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onosproject</groupId>
             <artifactId>onos-lisp-ctl</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -51,6 +46,13 @@
             <artifactId>easymock</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-lisp-api</artifactId>
+            <version>${project.version}</version>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/providers/lisp/device/src/test/java/org/onosproject/provider/lisp/device/impl/LispControllerAdapter.java b/providers/lisp/device/src/test/java/org/onosproject/provider/lisp/device/impl/LispControllerAdapter.java
deleted file mode 100644
index 22c651f..0000000
--- a/providers/lisp/device/src/test/java/org/onosproject/provider/lisp/device/impl/LispControllerAdapter.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2017-present Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.provider.lisp.device.impl;
-
-import org.onosproject.lisp.ctl.LispController;
-import org.onosproject.lisp.ctl.LispMessageListener;
-import org.onosproject.lisp.ctl.LispRouter;
-import org.onosproject.lisp.ctl.LispRouterId;
-import org.onosproject.lisp.ctl.LispRouterListener;
-
-/**
- * Test Adapter for LispController.
- */
-public class LispControllerAdapter implements LispController {
-    @Override
-    public Iterable<LispRouter> getRouters() {
-        return null;
-    }
-
-    @Override
-    public Iterable<LispRouter> getSubscribedRouters() {
-        return null;
-    }
-
-    @Override
-    public LispRouter connectRouter(LispRouterId routerId) {
-        return null;
-    }
-
-    @Override
-    public void disconnectRouter(LispRouterId routerId, boolean remove) {
-
-    }
-
-    @Override
-    public LispRouter getRouter(LispRouterId routerId) {
-        return null;
-    }
-
-    @Override
-    public void addRouterListener(LispRouterListener listener) {
-
-    }
-
-    @Override
-    public void removeRouterListener(LispRouterListener listener) {
-
-    }
-
-    @Override
-    public void addMessageListener(LispMessageListener listener) {
-
-    }
-
-    @Override
-    public void removeMessageListener(LispMessageListener listener) {
-
-    }
-}
diff --git a/providers/lisp/device/src/test/java/org/onosproject/provider/lisp/device/impl/LispDeviceProviderTest.java b/providers/lisp/device/src/test/java/org/onosproject/provider/lisp/device/impl/LispDeviceProviderTest.java
index c040ca3..17f9eed 100644
--- a/providers/lisp/device/src/test/java/org/onosproject/provider/lisp/device/impl/LispDeviceProviderTest.java
+++ b/providers/lisp/device/src/test/java/org/onosproject/provider/lisp/device/impl/LispDeviceProviderTest.java
@@ -22,6 +22,7 @@
 import org.onosproject.core.CoreService;
 import org.onosproject.core.DefaultApplicationId;
 import org.onosproject.lisp.ctl.LispController;
+import org.onosproject.lisp.ctl.LispControllerAdapter;
 import org.onosproject.lisp.ctl.LispRouter;
 import org.onosproject.lisp.ctl.LispRouterListener;
 import org.onosproject.net.device.DeviceListener;