diff --git a/Maintenance/infrastructure/picasso.geometryfactory.com/autocgalrc b/Maintenance/infrastructure/picasso.geometryfactory.com/autocgalrc
index f0ec6fc1e60..89002ec8da0 100644
--- a/Maintenance/infrastructure/picasso.geometryfactory.com/autocgalrc
+++ b/Maintenance/infrastructure/picasso.geometryfactory.com/autocgalrc
@@ -1,5 +1,11 @@
 #!/bin/sh
 CGAL_ROOT="/cygdrive/c/cgal/test"
+
+# Remove test results older than 5 days.
+# The pattern "../test/" after "$CGAL_ROOT" tries to protect against a
+# catastrophic `rm -rf` is "$CGAL_ROOT" happens to be empty.
+find "$CGAL_ROOT/../test" -maxdepth 1 -type d -name 'CGAL*' ! -ctime -5 -exec rm -rf '{}' \;
+
 BUILD_HOSTS="localhost"
 REFERENCE_PLATFORMS_DIR="c:/cgal/reference_platforms"
 CGAL_TESTER="afabri"
diff --git a/Maintenance/infrastructure/picasso.geometryfactory.com/launch_testsuite.bat b/Maintenance/infrastructure/picasso.geometryfactory.com/launch_testsuite.bat
old mode 100644
new mode 100755