diff --git a/man/rules/meson.build b/man/rules/meson.build
index 9d375de83d..f98a55437c 100644
--- a/man/rules/meson.build
+++ b/man/rules/meson.build
@@ -1193,7 +1193,7 @@ manpages = [
  ['systemd.net-naming-scheme', '7', [], ''],
  ['systemd.netdev', '5', [], 'ENABLE_NETWORKD'],
  ['systemd.network', '5', [], 'ENABLE_NETWORKD'],
- ['systemd.nspawn', '5', [], ''],
+ ['systemd.nspawn', '5', [], 'ENABLE_NSPAWN'],
  ['systemd.offline-updates', '7', [], ''],
  ['systemd.path', '5', [], ''],
  ['systemd.pcrlock', '5', ['systemd.pcrlock.d'], ''],
diff --git a/man/systemd.nspawn.xml b/man/systemd.nspawn.xml
index 591933a10c..e6bf8209d3 100644
--- a/man/systemd.nspawn.xml
+++ b/man/systemd.nspawn.xml
@@ -6,7 +6,7 @@
 ]>
 <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
 
-<refentry id="systemd.nspawn" xmlns:xi="http://www.w3.org/2001/XInclude">
+<refentry id="systemd.nspawn" conditional="ENABLE_NSPAWN" xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <refentryinfo>
     <title>systemd.nspawn</title>
diff --git a/test/units/TEST-87-AUX-UTILS-VM.validatefs.sh b/test/units/TEST-87-AUX-UTILS-VM.validatefs.sh
index 5b142e178a..b4f3c58239 100755
--- a/test/units/TEST-87-AUX-UTILS-VM.validatefs.sh
+++ b/test/units/TEST-87-AUX-UTILS-VM.validatefs.sh
@@ -5,12 +5,12 @@ set -o pipefail
 
 if ! command -v systemd-repart >/dev/null; then
     echo "no systemd-repart"
-    return
+    exit 0
 fi
 
 if ! test -x /usr/lib/systemd/systemd-validatefs ; then
     echo "no systemd-validatefs"
-    return
+    exit 0
 fi
 
 export SYSTEMD_LOG_LEVEL=debug