diff --git a/jjb/xos-unit.yaml b/jjb/xos-unit.yaml
index 74aa652..3ac10ed 100644
--- a/jjb/xos-unit.yaml
+++ b/jjb/xos-unit.yaml
@@ -64,11 +64,14 @@
           pip install ipaddress==1.0.19
           echo "Requirements Installed"
 
-
           cd $BASEDIR/cord/orchestration/xos/lib/xos-util; python setup.py install; echo "xos-util Installed"
           cd $BASEDIR/cord/orchestration/xos/lib/xos-config; python setup.py install; echo "xos-config Installed"
           cd $BASEDIR/cord/orchestration/xos/lib/xos-genx; python setup.py install; echo "xos-genx Installed"
 
           # Run the tests
-          cd $BASEDIR
+          if [ $GERRIT_PROJECT = 'xos' ] ; then
+            cd $BASEDIR
+          else
+            cd $BASEDIR/cord/orchestration/xos_services/$GERRIT_PROJECT/xos
+          fi
           nose2 --verbose  --exclude-ignored-files