diff --git a/tools/test/bin/ogroup-opts b/tools/test/bin/ogroup-opts
index 93de5e0..41842bd 100644
--- a/tools/test/bin/ogroup-opts
+++ b/tools/test/bin/ogroup-opts
@@ -23,6 +23,19 @@
 complete -F _stc-opts stc
 
 
+# Tab completion settings for stl
+function _stl-opts () {
+  local cur=${COMP_WORDS[COMP_CWORD]}
+  if [ $COMP_CWORD -eq 1 ]; then
+    COMPREPLY=( $( compgen -W "$(cd /tmp/stc && ls -1)" -- $cur ) )
+  elif [ $COMP_CWORD -eq 2 ]; then
+    COMPREPLY=( $( compgen -W "$(cd /tmp/stc/$3 && ls -1)" -- $cur ) )
+  fi
+}
+
+complete -F _stl-opts stl
+
+
 # Tab completion settings for cell
 function _cell-opts () {
   local cur=${COMP_WORDS[COMP_CWORD]}
diff --git a/tools/test/bin/stl b/tools/test/bin/stl
new file mode 100755
index 0000000..1487ab4
--- /dev/null
+++ b/tools/test/bin/stl
@@ -0,0 +1,7 @@
+#!/bin/bash
+#-------------------------------------------------------------------------------
+#   System Test Coordinator
+#-------------------------------------------------------------------------------
+
+log=${2:-*}
+less /tmp/stc/$1/${log%.log}.log
\ No newline at end of file
diff --git a/tools/test/scenarios/archetypes.xml b/tools/test/scenarios/archetypes.xml
index 5913aeb..8244a32 100644
--- a/tools/test/scenarios/archetypes.xml
+++ b/tools/test/scenarios/archetypes.xml
@@ -13,7 +13,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<scenario name="archetypes-test" description="ONOS archetypes test">
+<scenario name="archetypes" description="ONOS archetypes test">
     <group name="Archetypes" cwd="${WORKSPACE}/tmp/test-app">
         <step name="Clean-Up" cwd="${WORKSPACE}/tmp" env="~"
               exec="rm -r test-app"/>
diff --git a/tools/test/scenarios/smoke.xml b/tools/test/scenarios/smoke.xml
index 1614f78..88608d5 100644
--- a/tools/test/scenarios/smoke.xml
+++ b/tools/test/scenarios/smoke.xml
@@ -13,7 +13,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<scenario name="smoke-test" description="ONOS smoke test">
+<scenario name="smoke" description="ONOS smoke test">
     <import file="${ONOS_SCENARIOS}/prerequisites.xml"/>
 
     <import file="${ONOS_SCENARIOS}/setup.xml"/>