diff --git a/tools/test/bin/ogroup-opts b/tools/test/bin/ogroup-opts
index b15ced9..ff75551 100644
--- a/tools/test/bin/ogroup-opts
+++ b/tools/test/bin/ogroup-opts
@@ -63,7 +63,7 @@
 function _ocapp-opts () {
   local cur=${COMP_WORDS[COMP_CWORD]}
   if [ $COMP_CWORD -eq 1 ]; then
-    COMPREPLY=( $( compgen -W "app bundle ui uitab uitopo cli rest" -- $cur ) )
+    COMPREPLY=( $( compgen -W "app bundle ui ui2 uitab uitopo cli rest" -- $cur ) )
   fi
 }
 
diff --git a/tools/test/bin/onos-archetypes-test b/tools/test/bin/onos-archetypes-test
index 711cf50..931a379 100755
--- a/tools/test/bin/onos-archetypes-test
+++ b/tools/test/bin/onos-archetypes-test
@@ -22,7 +22,7 @@
 export ARCHETYPE_OPTS="-DarchetypeGroupId=org.onosproject -DarchetypeVersion=2.2.0-SNAPSHOT"
 
 mkdir -p $AROOT
-for an in api bundle cli rest ui uitab uitopo; do
+for an in api bundle cli rest ui ui2 uitab uitopo; do
     cd $AROOT
     rm -fr $AROOT/foo-$an
     mvn archetype:generate "$@" $ARCHETYPE_OPTS \