diff --git a/core/store/persistence/pom.xml b/core/store/persistence/pom.xml
index 74de8a7c8b..555de11adf 100644
--- a/core/store/persistence/pom.xml
+++ b/core/store/persistence/pom.xml
@@ -46,20 +46,21 @@
 
 
     <dependencies>
-        <dependency>
+        <!--<dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-api</artifactId>
+        </dependency>-->
+	    <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-api</artifactId>
+            <classifier>tests</classifier>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mapdb</groupId>
             <artifactId>mapdb</artifactId>
             <version>1.0.8</version>
         </dependency>
-        <dependency>
-            <groupId>org.junit</groupId>
-            <artifactId>com.springsource.org.junit</artifactId>
-            <version>4.11.0</version>
-        </dependency>
     </dependencies>
 
 </project>
diff --git a/core/store/persistence/src/main/java/org/onosproject/persistence/impl/test/PersistentMapTest.java b/core/store/persistence/src/main/test/test/PersistentMapTest.java
similarity index 99%
rename from core/store/persistence/src/main/java/org/onosproject/persistence/impl/test/PersistentMapTest.java
rename to core/store/persistence/src/main/test/test/PersistentMapTest.java
index d61e301642..b059f18ecc 100644
--- a/core/store/persistence/src/main/java/org/onosproject/persistence/impl/test/PersistentMapTest.java
+++ b/core/store/persistence/src/main/test/test/PersistentMapTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.persistence.impl.test;
+package test;
 
 import com.google.common.collect.Maps;
 import org.junit.After;
@@ -242,4 +242,4 @@ public class PersistentMapTest {
             map.put(i, i);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/store/persistence/src/main/java/org/onosproject/persistence/impl/test/PersistentSetTest.java b/core/store/persistence/src/main/test/test/PersistentSetTest.java
similarity index 99%
rename from core/store/persistence/src/main/java/org/onosproject/persistence/impl/test/PersistentSetTest.java
rename to core/store/persistence/src/main/test/test/PersistentSetTest.java
index a707f5562e..3107ab3012 100644
--- a/core/store/persistence/src/main/java/org/onosproject/persistence/impl/test/PersistentSetTest.java
+++ b/core/store/persistence/src/main/test/test/PersistentSetTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.persistence.impl.test;
+package test;
 
 import com.google.common.collect.Sets;
 import org.junit.After;
@@ -271,4 +271,4 @@ public class PersistentSetTest {
             set.add(i);
         }
     }
-}
\ No newline at end of file
+}