diff --git a/tools/dev/bash_profile b/tools/dev/bash_profile
index 8ae6b47..985ed13 100644
--- a/tools/dev/bash_profile
+++ b/tools/dev/bash_profile
@@ -175,6 +175,17 @@
 # Sets the primary instance to the specified instance number.
 function setPrimaryInstance {
     export ONOS_INSTANCES=$(env | grep 'OC[0-9]*=' | sort | cut -d= -f2)
+
+    if [ -z "$OCC1" ]; then
+        aux=/tmp/cell-$$.aux
+        let i=1
+        for n in $ONOS_INSTANCES; do
+            echo "export OCC$i=$n" >> $aux
+            let i=i+1
+        done
+        [ -f $aux ] && source $aux && rm $aux
+    fi
+
     export ONOS_CORES=$(env | grep 'OCC[0-9]*=' | sort | cut -d= -f2)
     export OCI=$(env | egrep "OC[0-9]+" | sort | egrep OC${1:-1} | cut -d= -f2)
     echo $OCI
diff --git a/tools/test/bin/onos-verify-cell b/tools/test/bin/onos-verify-cell
index 68fc924..eaf87bd 100755
--- a/tools/test/bin/onos-verify-cell
+++ b/tools/test/bin/onos-verify-cell
@@ -8,7 +8,7 @@
 
 let err=0
 
-for node in $OCT $OCN $(env | sort | egrep "^OC[C]*[0-9]+" | cut -d= -f2); do
+for node in $OCT $OCN $(env | sort | egrep "^OC[C]*[0-9]+" | cut -d= -f2 | sort -u); do
     for i in {1..18}; do
         printf "%s: " $node; ssh -n -q -o StrictHostKeyChecking=no -o PasswordAuthentication=no -o ConnectTimeout=10 $ONOS_USER@$node hostname
         if [ $? -eq 0 ]; then