diff --git a/man/gnt-instance.sgml b/man/gnt-instance.sgml
index 176f70c0d737cac032e1bbe3f9d21be11b4a45ae..b43f0da4095a7a1a72aef8ce520f9ca8f11d2cd0 100644
--- a/man/gnt-instance.sgml
+++ b/man/gnt-instance.sgml
@@ -460,7 +460,10 @@
                   initrd to boot the instance with. Xen PVM instances
                   can use this always, while for KVM if this option is
                   only used if the <option>kernel_path</option> option
-                  is also specified.
+                  is also specified. You can pass here either an
+                  absolute filename (the path to the initrd) if you
+                  want to use an initrd, or use the format
+                  <userinput>no_initrd_path</userinput> for no initrd.
                 </para>
               </listitem>
             </varlistentry>
@@ -1127,7 +1130,7 @@ instance5: 11225
         <para>
           Show detailed information about the given instance(s). This is
           different from <command>list</command> as it shows detailed data
-          about the instance's disks (especially useful for the drbd disk 
+          about the instance's disks (especially useful for the drbd disk
           template).
         </para>
 
diff --git a/qa/qa_instance.py b/qa/qa_instance.py
index fe5dfb58d289ed819b18016b51a9d55bff18e480..af3afeb6af10295f027240cd7213f884008cb4d3 100644
--- a/qa/qa_instance.py
+++ b/qa/qa_instance.py
@@ -170,7 +170,7 @@ def TestInstanceModify(instance):
     ["-H", "%s=%s" % (constants.HV_KERNEL_PATH, test_kernel)],
     ["-H", "%s=%s" % (constants.HV_KERNEL_PATH, constants.VALUE_DEFAULT)],
     ["-H", "%s=%s" % (constants.HV_INITRD_PATH, test_initrd)],
-    ["-H", "%s=%s" % (constants.HV_INITRD_PATH, constants.VALUE_NONE)],
+    ["-H", "no_%s" % (constants.HV_INITRD_PATH, )],
     ["-H", "%s=%s" % (constants.HV_INITRD_PATH, constants.VALUE_DEFAULT)],
 
     # TODO: bridge tests