diff --git a/units/dev-hugepages.automount b/units/dev-hugepages.automount
index dfd3868ef8..6e03df3560 100644
--- a/units/dev-hugepages.automount
+++ b/units/dev-hugepages.automount
@@ -9,6 +9,7 @@
 Description=Huge Pages File System Automount Point
 DefaultDependencies=no
 Before=sysinit.target
+ConditionPathExists=/sys/kernel/mm/hugepages
 
 [Automount]
 Where=/dev/hugepages
diff --git a/units/dev-mqueue.automount b/units/dev-mqueue.automount
index 73c4110efd..1061597571 100644
--- a/units/dev-mqueue.automount
+++ b/units/dev-mqueue.automount
@@ -9,6 +9,7 @@
 Description=POSIX Message Queue File System Automount Point
 DefaultDependencies=no
 Before=sysinit.target
+ConditionPathExists=/proc/sys/fs/mqueue
 
 [Automount]
 Where=/dev/mqueue