diff --git a/common-subtree.sh b/common-subtree.sh
index b757ed6115ca1f9e3ef9bb64d38df16f0018acbd..c99aa601b0498d823b88f6a9a5f76286207c65d5 100755
--- a/common-subtree.sh
+++ b/common-subtree.sh
@@ -8,7 +8,16 @@ usage () {
 }
 
 branch="$(git symbolic-ref --short HEAD)"
-test -z "$branch" && branch="master"
+case "$branch" in
+	apertis/*)
+		;;
+	*)
+        # take the default remote branch if we're not on a apertis/* branch
+		branch=$(git ls-remote --symref git@gitlab.apertis.org:tests/common.git HEAD \
+		         | grep ^ref: \
+		         | sed 's,ref: refs/heads/\(.*\)\s\+HEAD,\1,')
+		;;
+esac
 
 case $1 in
 pull)
diff --git a/run-aa-test b/run-aa-test
index 2ed214714b9e8ad78fc8bb44fac56ea28eff98ae..1d7f486b1aac2499b3f96ee9a2c2d9af6ad3b4d2 100755
--- a/run-aa-test
+++ b/run-aa-test
@@ -71,6 +71,7 @@ fi
 
 # Create a temporary directory for files
 TMP_DIR=$(mktemp -d)
+trap "rm -rf $TMP_DIR; exit" EXIT
 
 # Log start time
 START_TIME=$(date +"%F %T")
@@ -143,7 +144,7 @@ echo "#---8<--- expected parsed apparmor output from journal"
 cat ${EXPECT_FILE} | sed 's/^/# /'
 echo "#--->8---"
 
-csplit ${EXPECT_FILE} -f ${TMP_DIR}/EXPECT -b "%d" "/^${ALTERNATIVE_SEPARATOR}$/" {*}
+csplit ${EXPECT_FILE} -f ${TMP_DIR}/EXPECT -b "%0d" "/^${ALTERNATIVE_SEPARATOR}$/" {*}
 
 # Old versions of csplit don't provide "--suppress-matched", strip separator separately
 for FILE in ${TMP_DIR}/EXPECT*; do
diff --git a/run-test-in-systemd b/run-test-in-systemd
index ba2c3addc3be213cdf31b395e06f5e505c5f5d7a..6722f1937bb4a53c8186985c20e14094881daa24 100755
--- a/run-test-in-systemd
+++ b/run-test-in-systemd
@@ -300,7 +300,7 @@ ${systemctl} stop ${service} || :
 
 debug "waiting for end-of-file on command output..."
 wait "$cat_fifo_pid" || result=fail
-rm -fr "${user_log_dir}" || result=fail
+${as_target_user} rm -fr "${user_log_dir}" || result=fail
 
 if [ -n "${lava_runes}" ]; then
     "lava-test-case" "${name}" --result "${result}"
diff --git a/update-test-path b/update-test-path
index 61174ffba24e5f9d5fa56269cc22b3911bde093e..57e17cee650a91cf0cb83f925cdd41273ddc2472 100644
--- a/update-test-path
+++ b/update-test-path
@@ -6,11 +6,11 @@ PATH=${TESTPATH}/common:${TESTPATH}/bin:$PATH
 
 # Path for architecture specific binaries
 case `uname -m` in
-x86_64)  ARCHDIR=amd64 ;;
-armv7l)  ARCHDIR=armhf ;;
-aarch64) ARCHDIR=arm64 ;;
+x86_64)  ARCHDIR=amd64 ; ARCHLIBDIR=x86_64-linux-gnu ;;
+armv7l)  ARCHDIR=armhf ; ARCHLIBDIR=arm-linux-gnueabihf ;;
+aarch64) ARCHDIR=arm64 ; ARCHLIBDIR=aarch64-linux-gnu ;;
 esac
 
 PATH=${TESTPATH}/${ARCHDIR}/bin:$PATH
-export LD_LIBRARY_PATH=${TESTPATH}/${ARCHDIR}/lib:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=${TESTPATH}/${ARCHDIR}/lib:${LD_LIBRARY_PATH:-}