diff --git a/src/alire/alire-directories.adb b/src/alire/alire-directories.adb
index 7db13a7eb..4c8142ce6 100644
--- a/src/alire/alire-directories.adb
+++ b/src/alire/alire-directories.adb
@@ -641,16 +641,10 @@ package body Alire.Directories is
    function Temp_Name (Length : Positive := 8) return String is
       Result : String (1 .. Length + 4);
    begin
-
-      Char_Random.Reset (Gen, To_Integer (Seed));
-
-      return Result : String (1 .. Length + 4) do
-         Result (1 .. 4) := "alr-";
-         Result (Length + 1 .. Result'Last) := ".tmp";
-         for I in 5 .. Length loop
-            Result (I) := Char_Random.Random (Gen);
-         end loop;
-      end return;
+      Result (1 .. 4) := "alr-";
+      Result (Length + 1 .. Result'Last) := ".tmp";
+      Tempfile_Support.Next_Name (Result (5 .. Length));
+      return Result;
    end Temp_Name;
 
    ----------------
diff --git a/testsuite/tests/printenv/out-of-root/test.py b/testsuite/tests/printenv/out-of-root/test.py
index 6edc36078..90e05de26 100644
--- a/testsuite/tests/printenv/out-of-root/test.py
+++ b/testsuite/tests/printenv/out-of-root/test.py
@@ -20,11 +20,11 @@
 # Verify root crate proper path in GPR_PROJECT_PATH
 assert_match(r".*GPR_PROJECT_PATH[^\n]+"
              + re.escape(os.path.join(parent, "base"))
-             + "(:|\")", p.out)
+             + "(:|;|\")", p.out)
 
 # Verify pinned crate proper path in GPR_PROJECT_PATH
 assert_match(r".*GPR_PROJECT_PATH[^\n]+"
              + re.escape(os.path.join(parent, "base", "pinned"))
-             + "(:|\")", p.out)
+             + "(:|;|\")", p.out)
 
 print("SUCCESS")