diff --git a/tests/packer/init.sh b/tests/packer/init.sh
index be9529666..4a189d176 100644
--- a/tests/packer/init.sh
+++ b/tests/packer/init.sh
@@ -17,12 +17,11 @@ readonly DISTRIBUTION
 main() {
 	install -dm0750 -o "$SUDO_USER" -g "$SUDO_USER" "/home/$SUDO_USER/Projects/" "/home/$SUDO_USER/Projects/apparmor.d" "/home/$SUDO_USER/.config/"
 	install -Dm0644 -o "$SUDO_USER" -g "$SUDO_USER" $SRC/.bash_aliases "/home/$SUDO_USER/.bash_aliases"
-	install -Dm0644 -o "$SUDO_USER" -g "$SUDO_USER" $SRC/monitors.xml "/home/$SUDO_USER/.config/monitors.xml"
 	install -Dm0644 -o "$SUDO_USER" -g "$SUDO_USER" $SRC/htoprc "/home/$SUDO_USER/.config/htop/htoprc"
+	install -Dm0644 $SRC/parser.conf /etc/apparmor/parser.conf
 	install -Dm0644 $SRC/site.local /etc/apparmor.d/tunables/multiarch.d/site.local
 	install -Dm0755 $SRC/aa-update /usr/bin/aa-update
-	install -Dm0755 $SRC/aa-log-clean /usr/bin/aa-log-clean
-	cat $SRC/parser.conf >>/etc/apparmor/parser.conf
+	install -Dm0755 $SRC/aa-clean /usr/bin/aa-clean
 	chown -R "$SUDO_USER:$SUDO_USER" "/home/$SUDO_USER/.config/"
 
 	case "$DISTRIBUTION" in
diff --git a/tests/packer/src/aa-clean b/tests/packer/src/aa-clean
new file mode 100644
index 000000000..a01b9d77e
--- /dev/null
+++ b/tests/packer/src/aa-clean
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+set -eu -o pipefail
+rm -vf /var/log/audit/* /var/log/syslog*
+touch /var/log/audit/audit.log /var/log/syslog
diff --git a/tests/packer/src/aa-log-clean b/tests/packer/src/aa-log-clean
deleted file mode 100644
index 9f3ebd818..000000000
--- a/tests/packer/src/aa-log-clean
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-set -eu
-rm -rf /var/log/audit/*
-touch /var/log/audit/audit.log
diff --git a/tests/packer/src/aa-update b/tests/packer/src/aa-update
index 9a326305d..48267d2f0 100644
--- a/tests/packer/src/aa-update
+++ b/tests/packer/src/aa-update
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eu
+set -eu -o pipefail
 
 export BUILDDIR=/tmp/build/
 
diff --git a/tests/packer/src/monitors.xml b/tests/packer/src/monitors.xml
deleted file mode 100644
index b17136584..000000000
--- a/tests/packer/src/monitors.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<monitors version="2">
-  <configuration>
-    <logicalmonitor>
-      <x>0</x>
-      <y>0</y>
-      <scale>1</scale>
-      <primary>yes</primary>
-      <monitor>
-        <monitorspec>
-          <connector>Virtual-1</connector>
-          <vendor>RHT</vendor>
-          <product>QEMU Monitor</product>
-          <serial>0x00000000</serial>
-        </monitorspec>
-        <mode>
-          <width>1920</width>
-          <height>1080</height>
-          <rate>60</rate>
-        </mode>
-      </monitor>
-    </logicalmonitor>
-  </configuration>
-</monitors>
diff --git a/tests/packer/src/parser.conf b/tests/packer/src/parser.conf
index be8c42560..8651efad1 100644
--- a/tests/packer/src/parser.conf
+++ b/tests/packer/src/parser.conf
@@ -1,4 +1,9 @@
-
+# Turn creating/updating of the cache on by default
 write-cache
-cache-loc /etc/apparmor/earlypolicy/
+
+# Enable early policy loads to confine systemd, and services that can not depend
+# on the apparmor unit.
+cache-loc=/etc/apparmor/earlypolicy/
+
+# Adjust compression
 Optimize=compress-fast