diff --git a/tools/build/onos-package-test b/tools/build/onos-package-test
index 1e23786..59d5b42 100755
--- a/tools/build/onos-package-test
+++ b/tools/build/onos-package-test
@@ -3,33 +3,6 @@
 # Packages ONOS test facilities into onos-test.tar.gz
 # -----------------------------------------------------------------------------
 
-echo "Use 'onos-buck build //:onos-test' instead"
-exit 1
-
-set -e
-
 [ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
-. $ONOS_ROOT/tools/build/envDefaults
-
-# Bail on any errors
-set -e
-
-rm -fr $ONOS_TEST_STAGE # Remove this when package script is completed
-
-# Create the stage directory and warp into it
-mkdir -p $ONOS_TEST_STAGE/tools/test \
-    $ONOS_TEST_STAGE/tools/dev/bin \
-    $ONOS_TEST_STAGE/tools/build \
-    $ONOS_TEST_STAGE/tools/package/config
-
-cp -r $ONOS_ROOT/tools/test $ONOS_TEST_STAGE/tools
-cp $ONOS_ROOT/tools/dev/bash_profile $ONOS_TEST_STAGE/tools/dev
-cp $ONOS_ROOT/tools/dev/bin/onos-app $ONOS_ROOT/tools/dev/bin/onos-create-app $ONOS_TEST_STAGE/tools/dev/bin
-cp $ONOS_ROOT/tools/build/envDefaults $ONOS_TEST_STAGE/tools/build
-
-cd $ONOS_TEST_STAGE_ROOT
-
-# Now package up the ONOS test tools tar file
-COPYFILE_DISABLE=1 tar zcf $ONOS_TEST_TAR $ONOS_TEST_BITS
-cd $ONOS_TEST_STAGE_ROOT
-# rm -r $ONOS_TEST_STAGE
+cd $ONOS_ROOT && onos-buck build //:onos-test --show-output
+exit $?