diff --git a/client/tests/kvm/kvm_tests.cfg.sample b/client/tests/kvm/kvm_tests.cfg.sample
index eb8eefd..7b49edb 100644
--- a/client/tests/kvm/kvm_tests.cfg.sample
+++ b/client/tests/kvm/kvm_tests.cfg.sample
@@ -49,6 +49,14 @@ variants:
         kill_vm_timeout = 60
         kill_vm_timeout_on_error = 0
 
+    - unattended_install:
+        type = unattended_install
+        kill_vm_on_error = yes
+        force_create_image = yes
+        pre_command = scripts/unattended.py
+        floppy = "floppy.img"
+        extra_params = "-boot d"
+
     - setup:        install
         type = steps
         fail_if_stuck_for = 300
@@ -244,36 +252,74 @@ variants:
                     - 8.32:
                         no setup
                         image_name = fc8-32
+                        cdrom = linux/Fedora-8-i386-DVD.iso
+                        md5sum = dd6c79fddfff36d409d02242e7b10189
+                        md5sum_1m = dabae451bb69fbbad0e505b25144b1f9
                         install:
                             steps = Fedora-8-i386.steps
-                            cdrom = linux/Fedora-8-i386-DVD.iso
-                            md5sum = dd6c79fddfff36d409d02242e7b10189
-                            md5sum_1m = dabae451bb69fbbad0e505b25144b1f9
 
                     - 8.64:
                         no setup
                         image_name = fc8-64
+                        cdrom = linux/Fedora-8-x86_64-DVD.iso
+                        md5sum = 2cb231a86709dec413425fd2f8bf5295
+                        md5sum_1m = 145f6414e19492649a56c89f0a45e719
                         install:
                             steps = Fedora-8-64.steps
-                            cdrom = linux/Fedora-8-x86_64-DVD.iso
-                            md5sum = 2cb231a86709dec413425fd2f8bf5295
-                            md5sum_1m = 145f6414e19492649a56c89f0a45e719
 
                     - 9.32:
                         image_name = fc9-32
+                        cdrom = linux/Fedora-9-i386-DVD.iso
+                        md5sum = 72601f685ea8c808c303353d8bf4d307
+                        md5sum_1m = f24fa25689e5863f1b99984c6feb787f
                         install:
                             steps = Fedora-9-i386.steps
-                            cdrom = linux/Fedora-9-i386-DVD.iso
-                            md5sum = 72601f685ea8c808c303353d8bf4d307
-                            md5sum_1m = f24fa25689e5863f1b99984c6feb787f
 
                     - 9.64:
                         image_name = fc9-64
+                        cdrom = linux/Fedora-9-x86_64-DVD.iso
+                        md5sum = 05b2ebeed273ec54d6f9ed3d61ea4c96
+                        md5sum_1m = 9822ab5097e37e8fe306ef2192727db4
                         install:
                             steps = Fedora-9-64.steps
-                            cdrom = linux/Fedora-9-x86_64-DVD.iso
-                            md5sum = 05b2ebeed273ec54d6f9ed3d61ea4c96
-                            md5sum_1m = 9822ab5097e37e8fe306ef2192727db4
+
+                    - 10.32:
+                        image_name = fc10-32
+                        cdrom = linux/Fedora-10-i386-DVD.iso
+                        md5sum = 27e581edb392728c4a07d00d3fc5ced0
+                        md5sum_1m = bd67c68bdf595e4ba7131ec702159181
+                        install:
+                            steps =
+                        unattended_install:
+                            tftp = "tftpboot"
+                            extra_params = "-bootp /pxelinux.0 -boot n"
+                            kernel_args = "ks=floppy nicdelay=60"
+                            unattended_file = unattended/Fedora-10.ks
+
+                    - 11.32:
+                        image_name = fc11-32
+                        cdrom = linux/Fedora-11-i386-DVD.iso
+                        md5sum = e3b1e2d1ba42aa4705fa5f41771b3927
+                        md5sum_1m = dc8ddf90648c247339c721395aa49714
+                        install:
+                            steps =
+                        unattended_install:
+                            tftp = "tftpboot"
+                            extra_params = "-bootp /pxelinux.0 -boot n"
+                            kernel_args = "ks=floppy nicdelay=60"
+                            unattended_file = unattended/Fedora-11.ks
+
+                    - 11.64:
+                        image_name = fc11-64
+                        cdrom = linux/Fedora-11-x86_64-DVD.iso
+                        md5sum = 9d419844adeb93120215fe7505c9bce8
+                        install:
+                            steps =
+                        unattended_install:
+                            tftp = "tftpboot"
+                            extra_params = "-bootp /pxelinux.0 -boot n"
+                            kernel_args = "ks=floppy nicdelay=60"
+                            unattended_file = unattended/Fedora-11.ks
 
             - DSL-4.2.5:
                 no setup dbench bonnie linux_s3
@@ -472,22 +518,22 @@ variants:
                 no reboot
                 image_name = win2000-32
                 kill_vm_gracefully = no
+                cdrom = windows/Windows2000_sp4.iso
+                md5sum = dda6039f3a9173f0f6bfae40f5efdfea
+                md5sum_1m = dd28fba196d366d56fe774bd93df5527
                 install:
                     steps = Win2000-32.steps
-                    cdrom = windows/Windows2000_sp4.iso
-                    md5sum = dda6039f3a9173f0f6bfae40f5efdfea
-                    md5sum_1m = dd28fba196d366d56fe774bd93df5527
                     user = user
                 setup:
                     steps = Win2000-32-rss.steps
 
             - WinXP.32:
                 image_name = winXP-32
+                cdrom = windows/WindowsXP-sp2-vlk.iso
+                md5sum = 743450644b1d9fe97b3cf379e22dceb0
+                md5sum_1m = b473bf75af2d1269fec8958cf0202bfd
                 install:
                     steps = WinXP-32.steps
-                    cdrom = windows/WindowsXP-sp2-vlk.iso
-                    md5sum = 743450644b1d9fe97b3cf379e22dceb0
-                    md5sum_1m = b473bf75af2d1269fec8958cf0202bfd
                     user = user
                 setup:
                     steps = WinXP-32-rss.steps
@@ -495,11 +541,11 @@ variants:
             - WinXP.64:
                 no reboot
                 image_name = winXP-64
+                cdrom = windows/WindowsXP-64.iso
+                md5sum = 8d3f007ec9c2060cec8a50ee7d7dc512
+                md5sum_1m = e812363ff427effc512b7801ee70e513
                 install:
                     steps = WinXP-64.steps
-                    cdrom = windows/WindowsXP-64.iso
-                    md5sum = 8d3f007ec9c2060cec8a50ee7d7dc512
-                    md5sum_1m = e812363ff427effc512b7801ee70e513
                     user = user
                 setup:
                     steps = WinXP-64-rss.steps
@@ -512,22 +558,22 @@ variants:
                 variants:
                     - 32:
                         image_name = win2003-32
+                        cdrom = windows/Windows2003_r2_VLK.iso
+                        md5sum = 03e921e9b4214773c21a39f5c3f42ef7
+                        md5sum_1m = 37c2fdec15ac4ec16aa10fdfdb338aa3
                         install:
                             steps = Win2003-32.steps
-                            cdrom = windows/Windows2003_r2_VLK.iso
-                            md5sum = 03e921e9b4214773c21a39f5c3f42ef7
-                            md5sum_1m = 37c2fdec15ac4ec16aa10fdfdb338aa3
                             user = user
                         setup:
                             steps = Win2003-32-rss.steps
 
                     - 64:
                         image_name = win2003-64
+                        cdrom = windows/Windows2003-x64.iso
+                        md5sum = 5703f87c9fd77d28c05ffadd3354dbbd
+                        md5sum_1m = 439393c384116aa09e08a0ad047dcea8
                         install:
                             steps = Win2003-64.steps
-                            cdrom = windows/Windows2003-x64.iso
-                            md5sum = 5703f87c9fd77d28c05ffadd3354dbbd
-                            md5sum_1m = 439393c384116aa09e08a0ad047dcea8
                             user = user
                         setup:
                             steps = Win2003-64-rss.steps
@@ -539,21 +585,21 @@ variants:
                 variants:
                     - 32:
                         image_name += -32
+                        cdrom = windows/WindowsVista-32.iso
+                        md5sum = 1008f323d5170c8e614e52ccb85c0491
+                        md5sum_1m = c724e9695da483bc0fd59e426eaefc72
                         install:
                             steps = Win-Vista-32.steps
-                            cdrom = windows/WindowsVista-32.iso
-                            md5sum = 1008f323d5170c8e614e52ccb85c0491
-                            md5sum_1m = c724e9695da483bc0fd59e426eaefc72
                         setup:
                             steps = WinVista-32-rss.steps
 
                     - 64:
                         image_name += -64
+                        cdrom = windows/WindowsVista-64.iso
+                        md5sum = 11e2010d857fffc47813295e6be6d58d
+                        md5sum_1m = 0947bcd5390546139e25f25217d6f165
                         install:
                             steps = Win-Vista-64.steps
-                            cdrom = windows/WindowsVista-64.iso
-                            md5sum = 11e2010d857fffc47813295e6be6d58d
-                            md5sum_1m = 0947bcd5390546139e25f25217d6f165
                         setup:
                             steps = WinVista-64-rss.steps
 
@@ -566,25 +612,25 @@ variants:
                 variants:
                     - 32:
                         image_name += -32
+                        cdrom = windows/Windows2008-x86.iso
+                        #en_windows_server_2008_datacenter_enterprise_standard_x86_dvd_X14-26710.iso
+                        #sha1sum = 6CA018FF96F1E9B2B310A36546B6FDED99A421E6
+                        md5sum=0bfca49f0164de0a8eba236ced47007d
+                        md5sum_1m=07d7f5006393f74dc76e6e2e943e2440
                         install:
                             steps = Win2008-32.steps
-                            cdrom = windows/Windows2008-x86.iso
-                            #en_windows_server_2008_datacenter_enterprise_standard_x86_dvd_X14-26710.iso
-                            #sha1sum = 6CA018FF96F1E9B2B310A36546B6FDED99A421E6
-                            md5sum=0bfca49f0164de0a8eba236ced47007d
-                            md5sum_1m=07d7f5006393f74dc76e6e2e943e2440
                         setup:
                             steps = Win2008-32-rss.steps
 
                     - 64:
                         image_name += -64
+                        cdrom = windows/Windows2008-x64.iso
+                        #en_windows_server_2008_datacenter_enterprise_standard_x64_dvd_X14-26714.iso
+                        #sha1sum = BD000374709F67E9358814DB6EC8F0DDAAA16F70
+                        md5sum=27c58cdb3d620f28c36333a5552f271c
+                        md5sum_1m=efdcc11d485a1ef9afa739cb8e0ca766
                         install:
                             steps = Win2008-64.steps
-                            cdrom = windows/Windows2008-x64.iso
-                            #en_windows_server_2008_datacenter_enterprise_standard_x64_dvd_X14-26714.iso
-                            #sha1sum = BD000374709F67E9358814DB6EC8F0DDAAA16F70
-                            md5sum=27c58cdb3d620f28c36333a5552f271c
-                            md5sum_1m=efdcc11d485a1ef9afa739cb8e0ca766
                             passwd = 1q2w3eP
                         setup:
                             steps = Win2008-64-rss.steps
@@ -733,6 +779,26 @@ variants:
     - @custom:
         only qcow2.*ide.*default.*up.*Ubuntu-8.10-server.*(autotest.sleeptest)
         only rtl8139
+    - @winXP_32_unattended:
+        only qcow2
+        only ide
+        only default
+        only up
+        only WinXP.32
+        no install setup
+        no kvm_hugepages
+        only unattended_install
+        only rtl8139
+    - @fc11_kickstart:
+        only qcow2
+        only ide
+        only default
+        only up
+        only Fedora.11.64
+        no install setup
+        no kvm_hugepages
+        only unattended_install boot shutdown
+        only rtl8139
 
 
 include kvm_cdkeys.cfg
