diff --git a/jjb/pipeline/all-xos-api-test-helm.groovy b/jjb/pipeline/all-xos-api-test-helm.groovy
index 4437414..9dcb6ce 100644
--- a/jjb/pipeline/all-xos-api-test-helm.groovy
+++ b/jjb/pipeline/all-xos-api-test-helm.groovy
@@ -190,8 +190,13 @@
     post {
         always {
             sh '''
-                kubectl get pods --all-namespaces
-                helm list
+              kubectl get pods --all-namespaces
+              helm list
+              helm delete --purge xos-core
+              if [[ "$GERRIT_PROJECT" =~ ^(rcord|vrouter|vsg|vtn|vtr|fabric|openstack|chameleon|exampleservice|simpleexampleservice|onos-service|olt-service|kubernetes-service)\$ ]]; then
+                helm delete --purge rcord-lite
+              fi
+              minikube delete
             '''
             step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: "suchitra@opennetworking.org, you@opennetworking.org, kailash@opennetworking.org", sendToIndividuals: false])
         }
diff --git a/jjb/pipeline/helm-api-test.groovy b/jjb/pipeline/helm-api-test.groovy
index 4540502..7271d7a 100644
--- a/jjb/pipeline/helm-api-test.groovy
+++ b/jjb/pipeline/helm-api-test.groovy
@@ -130,6 +130,7 @@
          kubectl logs xos-core-api-test
          kubectl delete pod xos-core-api-test
          helm delete --purge xos-core
+         minikube delete
          '''
       deleteDir()
     }
diff --git a/jjb/xos-unit.yaml b/jjb/xos-unit.yaml
index 3ac10ed..70a9221 100644
--- a/jjb/xos-unit.yaml
+++ b/jjb/xos-unit.yaml
@@ -67,6 +67,7 @@
           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"
+          cd $BASEDIR/cord/orchestration/xos/xos/xos_client; make; echo "xos-client Installed"
 
           # Run the tests
           if [ $GERRIT_PROJECT = 'xos' ] ; then