diff --git a/reactos/boot/bootdata/bootcdregtest/regtest.cmd b/reactos/boot/bootdata/bootcdregtest/regtest.cmd
new file mode 100644
index 00000000000..f33b9d32429
--- /dev/null
+++ b/reactos/boot/bootdata/bootcdregtest/regtest.cmd
@@ -0,0 +1,3 @@
+@echo off
+dbgprint --process "ipconfig"
+start rosautotest /r /s
\ No newline at end of file
diff --git a/reactos/boot/bootdata/bootcdregtest/unattend.inf b/reactos/boot/bootdata/bootcdregtest/unattend.inf
index 75541e2b7de..6ada5a6a272 100644
--- a/reactos/boot/bootdata/bootcdregtest/unattend.inf
+++ b/reactos/boot/bootdata/bootcdregtest/unattend.inf
@@ -1,54 +1,54 @@
-; In order to get unattended setup working:
-; 1. Copy unattend.inf.sample to unattend.inf, adjust as needed
-; 2. Uncomment the line in bootdata.rbuild to include it into bootcd
-
-[Unattend]
-Signature = "$ReactOS$"
-
-; yes - unattend setup enabled
-; no - unattend setup disabled
-UnattendSetupEnabled = yes
-
-; Install to \Device\Harddisk0\Partition1\ReactOS
-DestinationDiskNumber = 0
-DestinationPartitionNumber = 1
-InstallationDirectory=ReactOS
-
-; MBRInstallType=0  skips MBR installation
-; MBRInstallType=1  install MBR on floppy  
-; MBRInstallType=2  install MBR on hdd
-MBRInstallType=2 
-
-FullName="MyName"
-;OrgName="MyOrg"
-ComputerName="MYCOMPUTERNAME";
-AdminPassword="MyPassword"
-
-; TimeZone is set GMT as default
-TimeZoneIndex=85
-
-; enable this setting to disable daylight saving changes
-; DisableAutoDaylightTimeSet = 1
-
-; enable this setting to format the selected partition
-; 1 - format enabled
-; 0 - format disabled
-FormatPartition=1
-
-; enable this setting to automatically create a partition
-; during installation
-; 1 - enabled
-; 0 - disabled
-AutoPartition = 1
-
-; enable this setting to disable vmware driver install
-; yes - disabled
-; no  - enabled
-DisableVmwInst = yes
-LocaleID = 409
-
-; enable this section to automatically launch programs
-; after 3rd boot
-;
-[GuiRunOnce]
-%SystemRoot%\system32\rosautotest.exe /r /s
+; In order to get unattended setup working:
+; 1. Copy unattend.inf.sample to unattend.inf, adjust as needed
+; 2. Uncomment the line in bootdata.rbuild to include it into bootcd
+
+[Unattend]
+Signature = "$ReactOS$"
+
+; yes - unattend setup enabled
+; no - unattend setup disabled
+UnattendSetupEnabled = yes
+
+; Install to \Device\Harddisk0\Partition1\ReactOS
+DestinationDiskNumber = 0
+DestinationPartitionNumber = 1
+InstallationDirectory=ReactOS
+
+; MBRInstallType=0  skips MBR installation
+; MBRInstallType=1  install MBR on floppy  
+; MBRInstallType=2  install MBR on hdd
+MBRInstallType=2 
+
+FullName="MyName"
+;OrgName="MyOrg"
+ComputerName="MYCOMPUTERNAME";
+AdminPassword="MyPassword"
+
+; TimeZone is set GMT as default
+TimeZoneIndex=85
+
+; enable this setting to disable daylight saving changes
+; DisableAutoDaylightTimeSet = 1
+
+; enable this setting to format the selected partition
+; 1 - format enabled
+; 0 - format disabled
+FormatPartition=1
+
+; enable this setting to automatically create a partition
+; during installation
+; 1 - enabled
+; 0 - disabled
+AutoPartition = 1
+
+; enable this setting to disable vmware driver install
+; yes - disabled
+; no  - enabled
+DisableVmwInst = yes
+LocaleID = 409
+
+; enable this section to automatically launch programs
+; after 3rd boot
+;
+[GuiRunOnce]
+%SystemRoot%\system32\cmd.exe /c "regtest.cmd"
diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff
index d5c3bc26de8..6c27eb78563 100644
--- a/reactos/boot/bootdata/packages/reactos.dff
+++ b/reactos/boot/bootdata/packages/reactos.dff
@@ -631,12 +631,14 @@ media\inf\xboxdisp.inf                              6
 ; Ini Files
 boot\bootdata\system.ini                            4
 
+; Regression Testing
+boot\bootdata\bootcdregtest\regtest.cmd             7   optional
+
 ; Subsystems
 subsystems\win32\csrss\csrss.exe                    1
 subsystems\win32\csrss\win32csr\win32csr.dll        1
 subsystems\ntvdm\ntvdm.exe                          1
 subsystems\win32\win32k\win32k.sys                  1
-boot\bootdata\bootcdregtest\testboot.bat            7   optional
 
 ; Modules
 modules\rosapps\applications\screensavers\cylfrac\cylfrac.scr              1   optional
diff --git a/reactos/dll/win32/syssetup/wizard.c b/reactos/dll/win32/syssetup/wizard.c
index 8bf259e5f62..4bda8f788f5 100644
--- a/reactos/dll/win32/syssetup/wizard.c
+++ b/reactos/dll/win32/syssetup/wizard.c
@@ -2133,7 +2133,7 @@ ProcessUnattendInf(HINF hUnattendedInf)
                         KEY_SET_VALUE,
                         &hKey) != ERROR_SUCCESS)
     {
-      DPRINT1("Error: failed to open HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\RunOnce\n");
+      DPRINT1("Error: failed to open HKLM\\Software\\Microsoft\\Windows\\CurrentVersion\\RunOnce\n");
       return TRUE;
     }