diff --git a/Makefile b/Makefile
index 1cd91cc131c835ce6bf8a36029808b7e9cb978cc..4e12dd8c8ec1facc803748d122de600214a63f89 100644
--- a/Makefile
+++ b/Makefile
@@ -67,6 +67,7 @@ COPY = \
 	folks \
 	grilo \
 	inherit-config.sh \
+	libreoffice \
 	misc \
 	predeployed-misc \
 	resources \
diff --git a/apparmor/apparmor-libreoffice.yaml b/apparmor/apparmor-libreoffice.yaml
index a3350af35d811289b2411f751ce66902b312ac17..6bf74e8796e865b9dbbfbcf6de6a8db94028ec1a 100644
--- a/apparmor/apparmor-libreoffice.yaml
+++ b/apparmor/apparmor-libreoffice.yaml
@@ -20,7 +20,7 @@ install:
 run:
   steps:
   - echo -n | sudo tee /var/log/audit/audit.log
-  - common/run-test-in-systemd --name run-test-libreoffice --timeout 300 /usr/lib/apertis-tests/apparmor/libreoffice/test-libreoffice
+  - common/run-test-in-systemd --name run-test-libreoffice --timeout 300 apparmor/libreoffice/test-libreoffice
   - sudo cat /var/log/audit/audit.log | aa_log_extract_tokens.pl PERMITTING REJECTING
 
 parse:
diff --git a/apparmor/libreoffice/libreoffice b/apparmor/libreoffice/libreoffice
index 9818d6529f235b54e1aba9d3f1e7630d6ef25d45..0795bb8a3109ae8ed57821fc163c8b6ea013f151 100755
--- a/apparmor/libreoffice/libreoffice
+++ b/apparmor/libreoffice/libreoffice
@@ -11,19 +11,19 @@ fi
 export APERTIS_TESTS_NAME_PREFIX="${1}_"
 export DEBUG=2
 
-here="$(cd "$(dirname "$0")" && pwd)"
+TESTS_DIR="$(cd "$(dirname "$0")" && pwd)"
 pkglibdir="$(cd "$(dirname "$0")"/../.. && pwd)"
 
-if [ -e "$here/libreoffice-malicious-override.so" ]; then
-    preload="$here/libreoffice-malicious-override.so"
+if [ -e "$TESTS_DIR/libreoffice-malicious-override.so" ]; then
+    preload="$TESTS_DIR/libreoffice-malicious-override.so"
 else
     preload="/usr/lib/apertis-tests/apparmor/libreoffice/libreoffice-malicious-override.so"
 fi
 
 if [[ $1 == "malicious" ]]; then
     LD_PRELOAD="$preload" \
-    /usr/share/chaiwala-tests/libreoffice/automated/run-test.sh
+    "$pkglibdir/libreoffice/automated/run-test.sh"
 else
-    /usr/share/chaiwala-tests/libreoffice/automated/run-test.sh
+    "$pkglibdir/libreoffice/automated/run-test.sh"
 fi
 
diff --git a/apparmor/libreoffice/test-libreoffice b/apparmor/libreoffice/test-libreoffice
index 991b1ad672532975b30d35e7061541bc143feeeb..39810208e77436a8aefcfad497aaffaeb56a38fb 100755
--- a/apparmor/libreoffice/test-libreoffice
+++ b/apparmor/libreoffice/test-libreoffice
@@ -1,7 +1,8 @@
 #!/bin/bash
 # vim: tw=0
 
-TEST_DIR="${TEST_DIR:-/usr/lib/apertis-tests/apparmor/libreoffice}"
+TEST_DIR="$(cd "$(dirname "$0")" && pwd)"
+
 # We don't need a DBUS session
 export LAUNCH_DBUS="no"
 
diff --git a/debian/apertis-tests.install b/debian/apertis-tests.install
index 202b01dc55cc7863011a68feee1e495dbb50b5c4..818475a02dc05a480be6dbe4bf9f46c57e0e0373 100644
--- a/debian/apertis-tests.install
+++ b/debian/apertis-tests.install
@@ -14,6 +14,7 @@ usr/lib/apertis-tests/dbus
 usr/lib/apertis-tests/grilo
 usr/lib/apertis-tests/folks
 usr/lib/apertis-tests/inherit-config.sh
+usr/lib/apertis-tests/libreoffice
 usr/lib/apertis-tests/misc
 usr/lib/apertis-tests/networking/proxy-manual/Makefile
 usr/lib/apertis-tests/networking/proxy-manual/README