diff --git a/tools/build/onos-package-test b/tools/build/onos-package-test
index 59d5b42..3f4fd41 100755
--- a/tools/build/onos-package-test
+++ b/tools/build/onos-package-test
@@ -4,5 +4,8 @@
 # -----------------------------------------------------------------------------
 
 [ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
-cd $ONOS_ROOT && onos-buck build //:onos-test --show-output
-exit $?
+. $ONOS_ROOT/tools/build/envDefaults
+
+cd $ONOS_ROOT && onos-buck build //:onos-test --show-output && \
+    rm -f $ONOS_TEST_TAR && \
+    ln -s $ONOS_ROOT/buck-out/gen/onos-test/onos-test-*.tar.gz $ONOS_TEST_TAR