diff --git a/lib/cli.py b/lib/cli.py
index 7a53ffef3acf55660632546fdeeea3a6f9ab5d98..70154602c378db1fce68bf1d294d8385b8e79f80 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -67,6 +67,7 @@ __all__ = [
   "NOIPCHECK_OPT",
   "NONICS_OPT",
   "NONLIVE_OPT",
+  "NOSTART_OPT",
   "NWSYNC_OPT",
   "OS_OPT",
   "OS_SIZE_OPT",
@@ -592,6 +593,10 @@ SINGLE_NODE_OPT = cli_option("-n", "--node", dest="node", help="Target node",
                              metavar="<node>",
                              completion_suggest=OPT_COMPL_ONE_NODE)
 
+NOSTART_OPT = cli_option("--no-start", dest="start", default=True,
+                         action="store_false",
+                         help="Don't start the instance after creation")
+
 
 def _ParseArgs(argv, commands, aliases):
   """Parser for the command line arguments.
diff --git a/scripts/gnt-instance b/scripts/gnt-instance
index bb88cf20086ef2e6016748c4efacdc5a526c45f1..6329233f30e1c5f0ec316d132f61f1df9293a35b 100755
--- a/scripts/gnt-instance
+++ b/scripts/gnt-instance
@@ -1367,9 +1367,7 @@ add_opts = [
   NET_OPT,
   NONICS_OPT,
   NWSYNC_OPT,
-  cli_option("--no-start", dest="start", default=True,
-             action="store_false", help="Don't start the instance after"
-             " creation"),
+  NOSTART_OPT,
   NOIPCHECK_OPT,
   FILESTORE_DIR_OPT,
   FILESTORE_DRIVER_OPT,