diff --git a/Makefile b/Makefile
index 8f56568079ae32fc8e32d5fc1220f037ca8a5f42..b7299f7e75e2b4fe9aaa98a2274d3b1d988d578c 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,6 @@ SUBDIRS = \
 	apparmor/tumbler \
 	apparmor/ofono \
 	apparmor/pulseaudio \
-	apparmor/automated/ \
 	bluez/ \
 	boot-performance/automated/ \
 	cgroups/automated/ \
diff --git a/apparmor/automated/Makefile b/apparmor/automated/Makefile
deleted file mode 100644
index 2bbaea1a001b0659e1937132f0e9fb55db6efa48..0000000000000000000000000000000000000000
--- a/apparmor/automated/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# vim: set ts=8 tw=80 :
-
-progs		:= 
-
-include ../../global-config.mk
-
-all: $(progs)
-
-get-deps:
-	$(APT_GET) install iputils-ping
-
-install: .INSTALL
-
-clean: .CLEAN
diff --git a/apparmor/automated/config.sh b/apparmor/automated/config.sh
deleted file mode 100644
index 9cb1b097af28df61bd202635c82a8fe50dbac823..0000000000000000000000000000000000000000
--- a/apparmor/automated/config.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-. "${TESTDIR}/inherit-config.sh"
-
-APPARMOR_PROFILES_DIRS=(
-"/etc/apparmor.d"
-"/etc/apparmor.d/local"
-"/etc/apparmor.d/tunables")
-AUDIT_LOG="/var/log/audit/audit.log"
-
diff --git a/apparmor/automated/inherit-config.sh b/apparmor/automated/inherit-config.sh
deleted file mode 100644
index 5a2257748255fd1a65c7ed3aa6342d46f72c592d..0000000000000000000000000000000000000000
--- a/apparmor/automated/inherit-config.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file should be symlinked inside your test directory,
-# and sourced from config.sh
-# It will be modified and copied to the install directory by make
-
-. "${TESTDIR}/../../common/common.sh"
-
-# These variables get modified by `make` during install
-TESTDATADIR="${TESTDIR}"
-TESTLIBDIR="${TESTDIR}"
-RESOURCE_DIR="$(_realpath ${TESTDIR}/../../resources)"
-
-# These are derived from the above
-MEDIA_RESOURCE_DIR="${RESOURCE_DIR}/media"
diff --git a/apparmor/automated/run-test.sh b/apparmor/automated/run-test.sh
index aabc916b006f75625517477fe11339a742db232c..eaf4b90d59351c69e8d04a88380c9c8c5f6f9f99 100755
--- a/apparmor/automated/run-test.sh
+++ b/apparmor/automated/run-test.sh
@@ -19,7 +19,14 @@ while [ "$#" -gt 0 ]; do
 done
 
 TESTDIR=$(cd $(dirname $0); pwd; cd - &>/dev/null)
-. "${TESTDIR}/config.sh"
+. "${TESTDIR}/../../common/common.sh"
+
+APPARMOR_PROFILES_DIRS=(
+"/etc/apparmor.d"
+"/etc/apparmor.d/local"
+"/etc/apparmor.d/tunables")
+AUDIT_LOG="/var/log/audit/audit.log"
+RESOURCE_DIR="$(cd "${TESTDIR}/../../resources" && pwd)"
 
 #########
 # Setup #
diff --git a/debian/chaiwala-tests.links b/debian/chaiwala-tests.links
index b2ce6e22b6eb539e1082cfd2df4c8bf73487b83a..e09a4f689f734f40eea0f9a4b011db0759c03941 100644
--- a/debian/chaiwala-tests.links
+++ b/debian/chaiwala-tests.links
@@ -1,3 +1,4 @@
+usr/lib/apertis-tests/apparmor/automated usr/share/chaiwala-tests/apparmor/automated
 usr/lib/apertis-tests/cgroups usr/lib/chaiwala-tests/cgroups
 usr/lib/apertis-tests/dbus/dos-match-rules usr/share/chaiwala-tests/dbus-dos-match-rules/manual
 usr/lib/apertis-tests/dbus/dos-reply-time usr/share/chaiwala-tests/dbus-dos-reply-time/manual
diff --git a/debian/chaiwala-tests.maintscript b/debian/chaiwala-tests.maintscript
index 105f07dff64ff3a59bf339f02cd12ff2cd642818..8c300c03228fddaf86178124f9ffb4afbd5eb4de 100644
--- a/debian/chaiwala-tests.maintscript
+++ b/debian/chaiwala-tests.maintscript
@@ -1,3 +1,4 @@
+dir_to_symlink /usr/lib/chaiwala-tests/apparmor/automated /usr/lib/apertis-tests/apparmor/automated
 dir_to_symlink /usr/lib/chaiwala-tests/cgroups /usr/lib/apertis-tests/cgroups
 symlink_to_dir /usr/share/chaiwala-tests/dbus-dos-match-rules/manual /usr/lib/apertis-tests/dbus/dos-match-rules
 symlink_to_dir /usr/share/chaiwala-tests/dbus-dos-reply-time/manual /usr/lib/apertis-tests/dbus/dos-reply-time