diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index a0469c8623b..7959f58c3c4 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-02  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+	* gdb.dwarf2/per-bfd-sharing.exp: Fix temp-dir leakage.
+
 2021-06-02  Carl Love  <cel@us.ibm.com>
 
 	* gdb.threads/threadapply.c: Add global mybarrier.
diff --git a/gdb/testsuite/gdb.dwarf2/per-bfd-sharing.exp b/gdb/testsuite/gdb.dwarf2/per-bfd-sharing.exp
index 081088a9839..48a30fa741c 100644
--- a/gdb/testsuite/gdb.dwarf2/per-bfd-sharing.exp
+++ b/gdb/testsuite/gdb.dwarf2/per-bfd-sharing.exp
@@ -18,6 +18,11 @@
 
 standard_testfile
 
+if { [build_executable "failed to prepare" $testfile $srcfile \
+	  {debug additional_flags=-Wl,--build-id}] == -1 } {
+    return
+}
+
 lassign [remote_exec host mktemp -d] ret cache_dir
 
 # The output of mktemp contains an end of line, remove it.
@@ -30,11 +35,6 @@ if { $ret != 0 } {
 
 verbose -log "Index cache dir: $cache_dir"
 
-if { [build_executable "failed to prepare" $testfile $srcfile \
-	  {debug additional_flags=-Wl,--build-id}] == -1 } {
-    return
-}
-
 # Populate the index-cache.
 with_test_prefix "populate index cache" {
     clean_restart