diff --git a/src/libpriv/rpmostree-scripts.c b/src/libpriv/rpmostree-scripts.c
index 0fc16180..c16df7d3 100644
--- a/src/libpriv/rpmostree-scripts.c
+++ b/src/libpriv/rpmostree-scripts.c
@@ -1014,7 +1014,7 @@ rpmostree_deployment_sanitycheck_true (int           rootfs_fd,
   if (getenv ("RPMOSTREE_SKIP_SANITYCHECK"))
     return TRUE;
 
-  GLNX_AUTO_PREFIX_ERROR ("sanitycheck", error);
+  GLNX_AUTO_PREFIX_ERROR ("Sanity-checking final rootfs", error);
   g_autoptr(RpmOstreeBwrap) bwrap =
     rpmostree_bwrap_new (rootfs_fd, RPMOSTREE_BWRAP_IMMUTABLE, error);
 
@@ -1061,6 +1061,8 @@ rpmostree_deployment_sanitycheck_rpmdb (int           rootfs_fd,
                                         GCancellable *cancellable,
                                         GError      **error)
 {
+  GLNX_AUTO_PREFIX_ERROR ("Sanity-checking final rpmdb", error);
+
   g_autoptr(RpmOstreeRefSack) sack = rpmostree_get_refsack_for_root (rootfs_fd, ".", error);
   if (!sack)
     return FALSE;
diff --git a/tests/vmcheck/test-layering-scripts.sh b/tests/vmcheck/test-layering-scripts.sh
index 6d1e461d..a9bc812a 100755
--- a/tests/vmcheck/test-layering-scripts.sh
+++ b/tests/vmcheck/test-layering-scripts.sh
@@ -220,7 +220,7 @@ if vm_rpmostree install rmrf 2>err.txt; then
 fi
 vm_cmd test -f /home/testuser/somedata -a -f /etc/fstab -a -f /tmp/sometmpfile -a -f /var/tmp/sometmpfile
 # This is the error today, we may improve it later
-assert_file_has_content err.txt 'error: sanitycheck: Executing bwrap(/usr/bin/true)'
+assert_file_has_content err.txt 'error: Sanity-checking final rootfs: Executing bwrap(/usr/bin/true)'
 echo "ok impervious to rm -rf post"
 
 # capabilities