diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 7efdd8d608e2368c584f93c4d5b471c8c3381de7..a9344718e1de22807896c833f6ebd2965fe2d83f 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -7096,9 +7096,8 @@ class LUInstanceCreate(LogicalUnit):
       raise errors.OpPrereqError("Invalid file driver name '%s'" %
                                  self.op.file_driver, errors.ECODE_INVAL)
 
-    if (self.op.disk_template == constants.DT_FILE and
-        not constants.ENABLE_FILE_STORAGE):
-      raise errors.OpPrereqError("File storage disabled")
+    if self.op.disk_template == constants.DT_FILE:
+      opcodes.RequireFileStorage()
 
     ### Node/iallocator related checks
     _CheckIAllocatorOrNode(self, "iallocator", "pnode")