diff --git a/reactos/tools/sysreg/rosboot_test.cpp b/reactos/tools/sysreg/rosboot_test.cpp
index 88c7c99c1ab..12bab86b684 100644
--- a/reactos/tools/sysreg/rosboot_test.cpp
+++ b/reactos/tools/sysreg/rosboot_test.cpp
@@ -137,6 +137,21 @@ namespace Sysreg_
 
 			cerr << line << endl;
 
+			if (line.find (_T("SYSREG_CHECKPOINT")) != string::npos)
+			{
+				line.erase (0, line.find (_T("SYSREG_CHECKPOINT")) + 19);
+				if (!_tcsncmp(line.c_str (), _T("USETUP_COMPLETE"), 15))
+				{
+					///
+					/// we need to stop the emulator to avoid
+					/// looping again into USETUP (at least with bootcdregtest)
+
+					return false;
+				}
+
+			}
+
+
 			if (line.find (_T("*** Fatal System Error")) != string::npos)
 			{
 				cerr << "BSOD detected" <<endl;