diff --git a/Tools/ART/scripts/art-task-build.sh b/Tools/ART/scripts/art-task-build.sh
index 86b6693752b25ef590f86b987a8ed73de16e2d89..c7f00ed941aca1b1dcde059e3f954d05cc7afadf 100755
--- a/Tools/ART/scripts/art-task-build.sh
+++ b/Tools/ART/scripts/art-task-build.sh
@@ -10,46 +10,52 @@ PROJECT=$2
 PLATFORM=$3
 DATESTAMP=$4
 
-echo Release base $RELEASE_BASE
-echo Project $PROJECT
-echo Platform $PLATFORM
-echo Date $DATESTAMP
-
-BRANCH=`echo $RELEASE_BASE |tr "/" " " |awk '{print $5}'`
-
-# setup for the build
-[[ "${ATLAS_LOCAL_ROOT_BASE}" = "" ]] && export ATLAS_LOCAL_ROOT_BASE="/cvmfs/atlas.cern.ch/repo/ATLASLocalRootBase"
-source ${ATLAS_LOCAL_ROOT_BASE}/user/atlasLocalSetup.sh --quiet
-lsetup asetup
-asetup none,cmakesetup --platform ${PLATFORM}
+BRANCH="$(echo "${RELEASE_BASE}" | tr '/' ' ' | awk '{print $5}')"
+echo BRANCH "${BRANCH}"
 
 if [ -d /cvmfs/atlas.cern.ch/repo/sw/tdaq ]; then
    echo "WARNING: Setting TDAQ_RELEASE_BASE to /cvmfs/atlas.cern.ch/repo/sw/tdaq"
    export TDAQ_RELEASE_BASE=/cvmfs/atlas.cern.ch/repo/sw/tdaq
 else
-   echo "Error: Cannot find TDAQ software installation"
+   echo "ERROR: Cannot find TDAQ software installation"
    return 1
 fi
-source ${RELEASE_BASE}/build/install/${PROJECT}/*/InstallArea/${PLATFORM}/setup.sh
 
-# setup as if asetup was run
-export AtlasBuildBranch=$BRANCH
-export AtlasProject=$PROJECT
-export ${AtlasProject}_PLATFORM=$PLATFORM
-export AtlasBuildStamp=$DATESTAMP
-export AtlasVersion=${AtlasBuildStamp}
+export ATLAS_LOCAL_ROOT_BASE="${ATLAS_LOCAL_ROOT_BASE:-/cvmfs/atlas.cern.ch/repo/ATLASLocalRootBase}"
+# shellcheck source=/dev/null
+source "${ATLAS_LOCAL_ROOT_BASE}"/user/atlasLocalSetup.sh --quiet
+if [ "${BRANCH}" == "master" ]; then
+   lsetup -a testing asetup
+   echo "INFO: setting up for master"
+else
+   lsetup -a current asetup
+   echo "INFO: setting up for ${BRANCH}"
+fi
+asetup "${PROJECT}" --platform "${PLATFORM}" --releasebase "${RELEASE_BASE}"/build/install --noLcgReleaseBase
+
+
+# setup AtlasBuildBranch since that is not set bu the above asetup for the local build setup
+export AtlasBuildBranch=${BRANCH}
+# for nightly testing point AtlasVersion to AtlasBuildStamp
+export AtlasVersion="${AtlasBuildStamp}"
+
+echo "TDAQ_RELEASE_BASE = ${TDAQ_RELEASE_BASE}"
+echo "AtlasBuildBranch = ${AtlasBuildBranch}"
+echo "AtlasProject = ${AtlasProject}"
+echo "AtlasBuildStamp  = ${AtlasBuildStamp}"
+echo "AtlasVersion = ${AtlasVersion}"
 
-ART_DIRECTORY=`which art.py`
-ART_VERSION=`art.py --version`
+ART_DIRECTORY=$(command -v art.py)
+ART_VERSION=$(art.py --version)
 echo "INFO: Using ART version ${ART_VERSION} in ${ART_DIRECTORY} directory"
 
 # run build tests
 SUBDIR=${BRANCH}/${PROJECT}/${PLATFORM}/${DATESTAMP}
 OUTDIR="${RELEASE_BASE}/art-build/${SUBDIR}"
-CMD="art.py run ${RELEASE_BASE}/build/build/${PROJECT} ${OUTDIR}"
-echo ${CMD}
-RESULT=`eval "${CMD}"`
-echo ${RESULT}
+CMD="art.py run ${RELEASE_BASE}/build/install/${PROJECT}/*/InstallArea/${PLATFORM}/src ${OUTDIR}"
+echo "${CMD}"
+RESULT=$(eval "${CMD}")
+echo "${RESULT}"
 
 # copy the test results to EOS area
 if [ -z "${EOS_MGM_URL}" ]; then
@@ -61,7 +67,7 @@ fi
 
 TARGETDIR=/eos/atlas/atlascerngroupdisk/data-art/build-output/${SUBDIR}
 if [[ ! -e ${TARGETDIR} ]]; then
-  echo Target directory ${TARGETDIR}
-  eos mkdir -p ${TARGETDIR}
-  xrdcp -vr ${OUTDIR} ${TARGETDIR}
+  echo Target directory "${TARGETDIR}"
+  eos mkdir -p "${TARGETDIR}"
+  xrdcp -vr "${OUTDIR}" "${TARGETDIR}"
 fi