diff --git a/cmd/geth/dbcmd.go b/cmd/geth/dbcmd.go
index 9f9b2419b5..8e62f2f6a5 100644
--- a/cmd/geth/dbcmd.go
+++ b/cmd/geth/dbcmd.go
@@ -1314,7 +1314,6 @@ func extractHeaders(ancientDb ethdb.AncientReader, headersFreezer *rawdb.Freezer
 	// Create a progress reporter
 	log.Info("Starting to copy headers to temporary freezer", "count", mergeBlock)
 
-
 	for i := uint64(0); i < mergeBlock; i += batchSize {
 		end := i + batchSize
 		if end > mergeBlock {
@@ -1372,7 +1371,6 @@ func reinsertHeaders(freezerDb ethdb.AncientStore, headersFreezer *rawdb.Freezer
 
 		_, err := freezerDb.ModifyAncients(func(op ethdb.AncientWriteOp) error {
 			for j := i; j < end; j++ {
-	log.Info("Completed copying headers back to main freezer", "count", mergeBlock)
 				// Read from temporary freezer
 				headerBytes, err := headersFreezer.Ancient(rawdb.ChainFreezerHeaderTable, j)
 				if err != nil {
@@ -1400,6 +1398,7 @@ func reinsertHeaders(freezerDb ethdb.AncientStore, headersFreezer *rawdb.Freezer
 		// Update progress
 	}
 
+	log.Info("Completed copying headers back to main freezer", "count", mergeBlock)
 	return nil
 }
 
diff --git a/cmd/geth/dbcmd_test.go b/cmd/geth/dbcmd_test.go
index defded5aed..f1a3413230 100644
--- a/cmd/geth/dbcmd_test.go
+++ b/cmd/geth/dbcmd_test.go
@@ -33,10 +33,7 @@ import (
 // in the truncate-freezer command.
 func TestTruncateFreezerBatching(t *testing.T) {
 	// Create a temporary directory for the test
-	datadir, err := os.MkdirTemp("", "geth-test-freezer-truncation-*")
-	if err != nil {
-		t.Fatalf("Failed to create temporary directory: %v", err)
-	}
+	datadir := t.TempDir()
 	defer os.RemoveAll(datadir)
 
 	// Create a freezer database
@@ -100,11 +97,7 @@ func TestTruncateFreezerBatching(t *testing.T) {
 	rawdb.WriteHeadBlockHash(db, parentHash)
 
 	// Create a temporary directory for the headers freezer
-	tmpDir, err := os.MkdirTemp("", "geth-headers-freezer-*")
-	if err != nil {
-		t.Fatalf("Failed to create temporary directory: %v", err)
-	}
-	defer os.RemoveAll(tmpDir)
+	tmpDir := t.TempDir()
 
 	// Create a new freezer for headers and hashes
 	headersFreezer, err := rawdb.NewFreezer(tmpDir, "headers", false, 2*1000*1000*1000, map[string]bool{