diff --git a/www/www.reactos.org/testman/index.php b/www/www.reactos.org/testman/index.php
index 5bc1291d..15a9500e 100644
--- a/www/www.reactos.org/testman/index.php
+++ b/www/www.reactos.org/testman/index.php
@@ -107,6 +107,10 @@
 						<option></option>
 						<option value="reactos">ReactOS</option>
 						<option value="5.2">Windows Server 2003</option>
+						<option value="6.0">Windows Vista</option>
+						<option value="6.1">Windows 7</option>
+						<option value="6.3">Windows 8.1</option>
+						<option value="10.0">Windows 10</option>
 					</select><br>
 				</div>
 			</div>
diff --git a/www/www.reactos.org/testman/utils.inc.php b/www/www.reactos.org/testman/utils.inc.php
index c8aab82a..a1c93053 100644
--- a/www/www.reactos.org/testman/utils.inc.php
+++ b/www/www.reactos.org/testman/utils.inc.php
@@ -52,7 +52,7 @@ function GetPlatformString($platform)
 					switch ($minor)
 					{
 						case 0:
-							if ($type = "s")
+							if ($type == "s")
 								$str = "Windows Server 2008";
 							else
 								$str = "Windows Vista";
@@ -60,7 +60,35 @@ function GetPlatformString($platform)
 							break;
 
 						case 1:
-							$str = "Windows 7";
+							if ($type == "s")
+								$str = "Windows Server 2008 R2";
+							else
+								$str = "Windows 7";
+
+							break;
+
+						case 3:
+							if ($type == "s")
+								$str = "Windows Server 2012 R2";
+							else
+								$str = "Windows 8.1";
+							break;
+
+						default:
+							return $platform;
+					}
+
+					break;
+
+				case 10:
+					switch ($minor)
+					{
+						case 0:
+							if ($type == "s")
+								$str = "Windows Server 2016";
+							else
+								$str = "Windows 10";
+
 							break;
 
 						default: