diff --git a/scripts/rebuild-testbench.sh b/scripts/rebuild-testbench.sh
index fee09fd243ae..bbbbafab99bf 100755
--- a/scripts/rebuild-testbench.sh
+++ b/scripts/rebuild-testbench.sh
@@ -5,16 +5,27 @@
 # stop on most errors
 set -e
 
-SCRIPT_DIR=$(cd "$(dirname "$0")" && pwd)
-SOF_REPO=$(dirname "$SCRIPT_DIR")
-TESTBENCH_DIR="$SOF_REPO"/tools/testbench
+# check if we are in the sof FW directory
+if [ -f "Kconfig.sof" ]; then
+    # now go to parent sof workspace directory
+    cd ..
+fi
+
+# check we are in the workspace directory
+if [ ! -d "sof" ]; then
+    echo "Error: This script must be run from the sof firmware toplevel or workspace directory"
+    exit 1
+fi
+
+TESTBENCH_DIR=$PWD/sof/tools/testbench
 
 # Defaults
 BUILD_BACKEND='make'
 BUILD_TYPE=native
-BUILD_DIR_NAME=build_testbench
+BUILD_DIR_NAME=$PWD/build_testbench
 BUILD_TARGET=install
 : "${SOF_AFL:=$HOME/sof/work/AFL/afl-gcc}"
+SCRIPT_DIR=$PWD/sof/scripts
 
 print_usage()
 {
@@ -59,7 +70,7 @@ setup_xtensa_tools_build()
 {
     BUILD_TYPE=xt
     BUILD_TARGET=
-    BUILD_DIR_NAME=build_xt_testbench
+    BUILD_DIR_NAME=$PWD/build_xt_testbench
 
     # check needed environment variables
     test -n "${XTENSA_TOOLS_ROOT}" || die "XTENSA_TOOLS_ROOT need to be set.\n"
@@ -90,7 +101,7 @@ setup_xtensa_tools_build()
 
 export_xtensa_setup()
 {
-    export_dir=$TESTBENCH_DIR/$BUILD_DIR_NAME
+    export_dir=$BUILD_DIR_NAME
     export_script=$export_dir/xtrun_env.sh
     xtbench=$export_dir/sof-testbench4
     xtbench_run="XTENSA_CORE=$XTENSA_CORE \$XTENSA_TOOLS_ROOT/$install_bin/xt-run $xtbench"
@@ -114,14 +125,14 @@ Success!
 
 For temporary, interactive Kconfiguration use:
 
-   $BUILD_BACKEND -C $TESTBENCH_DIR/$BUILD_DIR_NAME/sof_ep/build/  menuconfig
+   $BUILD_BACKEND -C $BUILD_DIR_NAME/sof_ep/build/  menuconfig
 
 Permanent configuration is "src/arch/host/configs/library_defconfig".
 
 For instant, incremental build:
 
    $src_env_msg
-   $BUILD_BACKEND -C $TESTBENCH_DIR/$BUILD_DIR_NAME/ -j$(nproc)
+   $BUILD_BACKEND -C $BUILD_DIR_NAME/ -j$(nproc)
 
 EOF0
 
diff --git a/scripts/sof-testbench-build-profile.sh b/scripts/sof-testbench-build-profile.sh
index 24cbd812ac4e..b39397965be1 100755
--- a/scripts/sof-testbench-build-profile.sh
+++ b/scripts/sof-testbench-build-profile.sh
@@ -30,7 +30,7 @@ fi
 
 #set default values
 PLATFORM=none
-PDIR=$PWD/sof/tools/testbench/profile
+PDIR=$PWD/testbench/profile
 
 while getopts "hp:d:" opt; do
     case "${opt}" in
diff --git a/scripts/sof-testbench-helper.sh b/scripts/sof-testbench-helper.sh
index 393b689cf973..f5cd43058d44 100755
--- a/scripts/sof-testbench-helper.sh
+++ b/scripts/sof-testbench-helper.sh
@@ -126,14 +126,14 @@ if [[ "$BITS" == "24" ]]; then
 else
     sox --encoding signed-integer "$CLIP" -L -r "$RATE_IN" -c "$CHANNELS_IN" -b "$BITS" "$INFILE1"
 fi
-
-TB4="$PWD/sof/tools/testbench/build_testbench/install/bin/sof-testbench4"
-XTB4="$PWD/sof/tools/testbench/build_xt_testbench/sof-testbench4"
-XTB4_SETUP="$PWD/sof/tools/testbench/build_xt_testbench/xtrun_env.sh"
+TOOLSDIR="$PWD/build_tools/testbench"
+TB4="$PWD/build_testbench/install/bin/sof-testbench4"
+XTB4="$PWD/build_xt_testbench/sof-testbench4"
+XTB4_SETUP="$PWD/build_xt_testbench/xtrun_env.sh"
 if [ -z "$TPLG0" ]; then
-    TPLG="$PWD/sof/tools/build_tools/topology/topology2/development/sof-hda-benchmark-${MODULE}${BITS}.tplg"
+    TPLG="$PWD/build_tools/topology/topology2/development/sof-hda-benchmark-${MODULE}${BITS}.tplg"
 else
-    TPLG="$PWD/sof/tools/build_tools/topology/topology2/$TPLG0"
+    TPLG="$PWD/build_tools/topology/topology2/$TPLG0"
 fi
 FMT="S${BITS}_LE"
 OPTS="-r $RATE_IN -R $RATE_OUT -c $CHANNELS_IN -c $CHANNELS_OUT -b $FMT -p $PIPELINES -t $TPLG -i $INFILE1 -o $OUTFILE1"