diff --git a/tools/build/onos-test b/tools/build/onos-test
index c681961..1391a5b 100755
--- a/tools/build/onos-test
+++ b/tools/build/onos-test
@@ -3,6 +3,9 @@
 # Launches the ONOS tests on the current cell environment.
 # -----------------------------------------------------------------------------
 
+echo "This command has been deprecated and will be removed after Falcon release"
+echo "Please use the 'stc setup' command instead"
+
 set -e
 
 [ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
diff --git a/tools/test/bin/onos-group b/tools/test/bin/onos-group
index 150f947..1337e28 100755
--- a/tools/test/bin/onos-group
+++ b/tools/test/bin/onos-group
@@ -3,6 +3,9 @@
 # Allows a select group of commands to be sent to all ONOS instances in a cell.
 # -----------------------------------------------------------------------------
 
+echo "This command has been deprecated and will be removed after Falcon release"
+echo "Please use the 'stc setup|shutdown|teardown' command instead"
+
 set -o pipefail
 IFS=$'\n'
 
diff --git a/tools/test/scenarios/teardown.xml b/tools/test/scenarios/teardown.xml
new file mode 100644
index 0000000..f43187b
--- /dev/null
+++ b/tools/test/scenarios/teardown.xml
@@ -0,0 +1,22 @@
+<!--
+  ~ Copyright 2014-2016 Open Networking Laboratory
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<scenario name="teardown" description="ONOS cluster teardown/uninstall">
+    <group name="Teardown">
+        <parallel var="${OC#}">
+            <step name="Uninstall-${#}" exec="onos-uninstall ${OC#}"/>
+        </parallel>
+    </group>
+</scenario>