diff --git a/Maintenance/test_handling/create_testresult_page b/Maintenance/test_handling/create_testresult_page
index ea3cf1ec266..b89f1382ed9 100755
--- a/Maintenance/test_handling/create_testresult_page
+++ b/Maintenance/test_handling/create_testresult_page
@@ -320,8 +320,6 @@ sub sort_pf {
     $platform_b = $platform;
     my $os_a = $platforms_info{$platform_a}->{operating_system} // '';
     my $os_b = $platforms_info{$platform_b}->{operating_system} // '';
-    $os_a =~ s/"//g;
-    $os_b =~ s/"//g;
     return $os_a cmp $os_b;
 }
 
@@ -740,7 +738,7 @@ sub get_warnings_and_errors {
 }
 
 sub create_summary_page {
-    my $platform_options = join("\n", map { "<option value=\"$_\">$_</option>" } @platforms_to_do);
+    my $platform_options = join("\n", map { "<option value=\"$_\">$platforms_info{$_}->{platform_name}</option>" } @platforms_to_do);
     my $test_directory;
     my @letters = ('r', 'n', 'w', 'o');
     my $letters_options = join("\n", map { "<option value=\"$_\">$_</option>" } @letters);
diff --git a/Maintenance/test_handling/to_zipped_format b/Maintenance/test_handling/to_zipped_format
index 63c14a1c562..ba2d0fd35f4 100755
--- a/Maintenance/test_handling/to_zipped_format
+++ b/Maintenance/test_handling/to_zipped_format
@@ -89,7 +89,8 @@ sub reformat_results($)
             $COMPILER = $1;
         }
         if (/-- Operating system: (.*)/) {
-            $OS = "$OS $1";
+            $OS = $1;
+            $OS =~ s/"//g;
         }
         if (/^TESTER_NAME\s+(.*)$/) {
             $TESTER_NAME = $1;