diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 95153acf6252cb1190337b6392f630b663a89a50..7efdd8d608e2368c584f93c4d5b471c8c3381de7 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -7464,6 +7464,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)