diff --git a/pom.xml b/pom.xml
index 5267aeb..23ee5b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -312,6 +312,13 @@
             </dependency>
             <dependency>
                 <groupId>org.onosproject</groupId>
+                <artifactId>onlab-osgi</artifactId>
+                <version>${project.version}</version>
+                <classifier>tests</classifier>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.onosproject</groupId>
                 <artifactId>onlab-junit</artifactId>
                 <version>${project.version}</version>
                 <scope>test</scope>
diff --git a/utils/osgi/pom.xml b/utils/osgi/pom.xml
index b1d2bf2..ad50640 100644
--- a/utils/osgi/pom.xml
+++ b/utils/osgi/pom.xml
@@ -36,6 +36,11 @@
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onlab-junit</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/utils/osgi/src/main/java/org/onlab/osgi/TestServiceDirectory.java b/utils/osgi/src/test/java/org/onlab/osgi/TestServiceDirectory.java
similarity index 100%
rename from utils/osgi/src/main/java/org/onlab/osgi/TestServiceDirectory.java
rename to utils/osgi/src/test/java/org/onlab/osgi/TestServiceDirectory.java
diff --git a/web/pom.xml b/web/pom.xml
index bd6e5fd..dc403b3 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -54,6 +54,13 @@
 
         <dependency>
             <groupId>org.onosproject</groupId>
+            <artifactId>onlab-osgi</artifactId>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onosproject</groupId>
             <artifactId>onlab-rest</artifactId>
             <version>${project.version}</version>
         </dependency>