diff --git a/Source/Tests/winver.nsi b/Source/Tests/winver.nsi
index 21ba0b93..bf74f01f 100644
--- a/Source/Tests/winver.nsi
+++ b/Source/Tests/winver.nsi
@@ -400,7 +400,7 @@ Section
 	StrCpy $OSVERSIONINFO_INIT "i 148, i 5, i 0, i 2195, i 2, &t128s, &i2 0, &i2 0, &i2 0, &i1 0, &i1 0"
 	# 94000000050000000000000093080000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 
-	!insertmacro TestWinVer "Windows 2000" 2000 0 client nt
+	!insertmacro TestWinVer "Windows 2000 SP0" 2000 0 client nt
 
 	#### WINDOWS 2000 SP4
 
@@ -482,7 +482,7 @@ Section
 
 	!insertmacro TestWinVer "Windows Server 2003" 2003 0 server nt
 
-	#### WINDOWS VISTA SP0
+	#### WINDOWS VISTA ULTIMATE SP0
 
 	# OSVERSIONINFOEX
 	StrCpy $OSVERSIONINFOEX_RES 1
@@ -496,7 +496,23 @@ Section
 	StrCpy $OSVERSIONINFO_INIT "i 148, i 6, i 0, i 6000, i 2, &t128s, &i2 0, &i2 0, &i2 0, &i1 0, &i1 0"
 	# 94000000060000000000000070170000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 
-	!insertmacro TestWinVer "Windows Vista" Vista 0 client nt
+	!insertmacro TestWinVer "Windows Vista SP0" Vista 0 client nt
+
+	#### WINDOWS VISTA ULTIMATE SP1
+
+	# OSVERSIONINFOEX
+	StrCpy $OSVERSIONINFOEX_RES 1
+	StrCpy $OSVERSIONINFOEX_CSD "Service Pack 1"
+	StrCpy $OSVERSIONINFOEX_INIT "i 156, i 6, i 0, i 6001, i 2, &t128 s, &i2 1, &i2 0, &i2 256, &i1 1, &i1 0"
+	# 9c0000000600000000000000711700000200000053657276696365205061636b2031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000001011e
+
+	# OSVERSIONINFO
+	StrCpy $OSVERSIONINFO_RES 1
+	StrCpy $OSVERSIONINFO_CSD "Service Pack 1"
+	StrCpy $OSVERSIONINFO_INIT "i 148, i 6, i 0, i 6001, i 2, &t128 s, &i2 114, &i2 118, &i2 43684, &i1 202, &i1 0"
+	# 940000000600000000000000711700000200000053657276696365205061636b2031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+
+	!insertmacro TestWinVer "Windows Vista SP1" Vista 1 client nt
 
 	#### WINDOWS 2008 SERVER SP1