diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index cf61fdffdfed62337ac6d883307c1d427507d0da..600707329f07219fab6f1d3ce4b2f731f0226c48 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -8251,6 +8251,8 @@ class LUInstanceCreate(LogicalUnit):
       if self.op.file_storage_dir is not None:
         joinargs.append(self.op.file_storage_dir)
 
+      joinargs.append(self.op.instance_name)
+
       # pylint: disable-msg=W0142
       self.instance_file_storage_dir = utils.PathJoin(*joinargs)