diff --git a/Installation/cmake/modules/CGAL_Macros.cmake b/Installation/cmake/modules/CGAL_Macros.cmake
index e113758a102..2a937ee19e0 100644
--- a/Installation/cmake/modules/CGAL_Macros.cmake
+++ b/Installation/cmake/modules/CGAL_Macros.cmake
@@ -324,7 +324,7 @@ if( NOT CGAL_MACROS_FILE_INCLUDED )
         endif()
       else()
 
-        if (NOT WITH_CGAL_${component}) 
+        if (NOT WITH_CGAL_${component})
           message(STATUS "NOTICE: The CGAL_${component} library seems to be required but is not build. Thus, it is expected that some executables will not be compiled.")
         endif()
 
diff --git a/Maintenance/test_handling/create_testresult_page b/Maintenance/test_handling/create_testresult_page
index d7e3890aa73..87b7eaf83ab 100755
--- a/Maintenance/test_handling/create_testresult_page
+++ b/Maintenance/test_handling/create_testresult_page
@@ -258,7 +258,7 @@ EOF
 		print OUTPUT ' class="error"';
 	    } elsif ($resulttext eq 'r') {
 		print OUTPUT ' class="requirements"';
-	    } 
+	    }
 	    else {
 		print OUTPUT ' class="na"';
 	    }
@@ -308,11 +308,11 @@ EOF
 sub sort_pf
 {
     # MSVS first
-    if($a =~ m/^MS/) { 
+    if($a =~ m/^MS/) {
         if($b =~ m/^MS/) {
             return $a cmp $b;
         }
-        else 
+        else
         {
             return -1;
         }
@@ -320,11 +320,11 @@ sub sort_pf
     if($b =~ m/^MS/) { return 1; }
 
     # g++/gcc second
-    if($a =~ m/^g[c+][c+]/) { 
+    if($a =~ m/^g[c+][c+]/) {
         if($b =~ m/^g[c+][c+]/) {
             return $a cmp $b;
         }
-        else 
+        else
         {
             return -1;
         }
@@ -332,11 +332,11 @@ sub sort_pf
     if($b =~ m/^g[c+][c+]/) { return 1; }
 
     # Intel third
-    if($a =~ m/^[iI]/) { 
+    if($a =~ m/^[iI]/) {
         if($b =~ m/^[iI]/) {
             return $a cmp $b;
         }
-        else 
+        else
         {
             return -1;
         }
@@ -344,11 +344,11 @@ sub sort_pf
     if($b =~ m/^[iI]/) { return 1; }
 
     # SunPro last
-    if($a =~ m/^[Ss][uU[Nn]/) { 
+    if($a =~ m/^[Ss][uU[Nn]/) {
         if($b =~ m/^[Ss][uU[Nn]/) {
             return $a cmp $b;
         }
-        else 
+        else
         {
             return 1;
         }
@@ -508,10 +508,10 @@ EOF
 	    chomp;
 	    print OUTPUT "</td>\n";
 	    print OUTPUT "<td><a href=\"mailto:$tester_address\">$tester_name</a></td>\n";
-	    print OUTPUT "<td>$county</td>\n"; 
-	    print OUTPUT "<td>$countw</td>\n"; 
- 	    print OUTPUT "<td>$countn</td>\n"; 
- 	    print OUTPUT "<td>$countr</td>\n"; 
+	    print OUTPUT "<td>$county</td>\n";
+	    print OUTPUT "<td>$countw</td>\n";
+ 	    print OUTPUT "<td>$countn</td>\n";
+ 	    print OUTPUT "<td>$countr</td>\n";
 	    $index = 8;
 	    while ($index) {
 	        $index--;
@@ -520,7 +520,7 @@ EOF
                     print OUTPUT "<td align=\"center\">$_</td>\n";
                 } else {
                     print OUTPUT "<td>$_</td>\n";
-                }                    
+                }
 	    }
 	} else {
             print OUTPUT ">$pf_short</a>";
@@ -546,12 +546,12 @@ sub print_platforms_numbers()
 	{
 	    $class = " class=\"";
 	    $tag = " ( ";
-            if($platform_is_64bits{$platform}) { 
-                $class = "$class os64bits"; 
+            if($platform_is_64bits{$platform}) {
+                $class = "$class os64bits";
                 $tag = $tag . "64 bits ";
             }
-            if($platform_is_optimized{$platform}) { 
-                $class = "$class highlight"; 
+            if($platform_is_optimized{$platform}) {
+                $class = "$class highlight";
                 $tag = $tag ." optimized: $platform_is_optimized{$platform}";
             }
             $class = $class . "\"";