diff --git a/run-aa-test b/run-aa-test
index d1a527679879ec361b3129cee4540217bfd20eb7..347676ee8b7a4d7749d4fdb00ca7159c7925b984 100755
--- a/run-aa-test
+++ b/run-aa-test
@@ -8,7 +8,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-. common/common-apparmor.sh
+PWD=$(cd $(dirname $0); pwd; cd - >/dev/null 2>&1)
+. ${PWD}/common-apparmor.sh
 
 ALTERNATIVE_SEPARATOR="## alternative ##"
 END=2
@@ -81,7 +82,7 @@ else
 	CMD="$*"
 fi
 
-CMDLINE="common/run-test-in-systemd"
+CMDLINE="${PWD}/run-test-in-systemd"
 if [ ! -x $CMDLINE ]; then
 	echo "common/run-test-in-systemd not found"
 	exit 1