diff --git a/microcloud/test/includes/microcloud.sh b/microcloud/test/includes/microcloud.sh
index a1820e67b..4cb7dbd70 100644
--- a/microcloud/test/includes/microcloud.sh
+++ b/microcloud/test/includes/microcloud.sh
@@ -968,6 +968,9 @@ setup_system() {
 
   # Create a snapshot so we can restore to this point.
   if [ "${SNAPSHOT_RESTORE}" = 1 ]; then
+    echo "==> XXX: working around LXD shutdown bug"
+    lxc exec "${name}" -- systemctl stop snap.lxd.daemon.service snap.lxd.daemon.unix.socket
+
     lxc stop "${name}"
     lxc snapshot "${name}" snap0
     lxc start "${name}"