diff --git a/Source/Tests/winver.nsi b/Source/Tests/winver.nsi
index 444a7e5c..09eb3a91 100644
--- a/Source/Tests/winver.nsi
+++ b/Source/Tests/winver.nsi
@@ -232,13 +232,18 @@ Var OSVERSIONINFOEX_INIT
 
 	# test service pack equality
 
-	${IfNot} ${IsServicePack} ${SP}
+	IntOp $0 ${SP} - 1
+	IntOp $1 ${SP} + 1
 
-		!insertmacro _WinVer_GetServicePackLevel $0
+	${IfNot} ${IsServicePack} ${SP}
+	${OrIf} ${IsServicePack} $0
+	${OrIf} ${IsServicePack} $1
+
+		!insertmacro _WinVer_GetServicePackLevel
 
 		DetailPrint "Service pack detection failed for ${NAME}"
 		DetailPrint "   Expected: ${SP}"
-		DetailPrint "   Got: $0"
+		DetailPrint "   Got: $_LOGICLIB_TEMP"
 
 		StrCpy $R0 "FAILURE"
 
@@ -246,9 +251,6 @@ Var OSVERSIONINFOEX_INIT
 
 	# test service pack comparison
 
-	IntOp $0 ${SP} - 1
-	IntOp $1 ${SP} + 1
-
 	${IfNot} ${AtLeastServicePack} ${SP}
 	${OrIfNot} ${AtLeastServicePack} $0
 	${OrIfNot} ${AtMostServicePack} ${SP}