diff --git a/indexer/postgres/tests/init_schema_test.go b/indexer/postgres/tests/init_schema_test.go
index e3fef06fc2..febe2d201a 100644
--- a/indexer/postgres/tests/init_schema_test.go
+++ b/indexer/postgres/tests/init_schema_test.go
@@ -2,7 +2,6 @@ package tests
 
 import (
 	"context"
-	"os"
 	"strings"
 	"testing"
 
@@ -69,11 +68,7 @@ func testInitSchema(t *testing.T, disableRetainDeletions bool, goldenFileName st
 
 func createTestDB(t *testing.T) (connectionUrl string) {
 	t.Helper()
-	tempDir, err := os.MkdirTemp("", "postgres-indexer-test")
-	require.NoError(t, err)
-	t.Cleanup(func() {
-		require.NoError(t, os.RemoveAll(tempDir))
-	})
+	tempDir := t.TempDir()
 
 	dbPort := freeport.GetOne(t)
 	pgConfig := embeddedpostgres.DefaultConfig().
diff --git a/indexer/postgres/tests/postgres_test.go b/indexer/postgres/tests/postgres_test.go
index 6256f83db3..0a6ca17eb8 100644
--- a/indexer/postgres/tests/postgres_test.go
+++ b/indexer/postgres/tests/postgres_test.go
@@ -2,7 +2,6 @@ package tests
 
 import (
 	"context"
-	"os"
 	"strings"
 	"testing"
 
@@ -31,8 +30,7 @@ func TestPostgresIndexer(t *testing.T) {
 func testPostgresIndexer(t *testing.T, retainDeletions bool) {
 	t.Helper()
 
-	tempDir, err := os.MkdirTemp("", "postgres-indexer-test")
-	require.NoError(t, err)
+	tempDir := t.TempDir()
 
 	dbPort := freeport.GetOne(t)
 	pgConfig := embeddedpostgres.DefaultConfig().
@@ -48,8 +46,6 @@ func testPostgresIndexer(t *testing.T, retainDeletions bool) {
 	t.Cleanup(func() {
 		cancel()
 		require.NoError(t, pg.Stop())
-		err := os.RemoveAll(tempDir)
-		require.NoError(t, err)
 	})
 
 	debugLog := &strings.Builder{}
diff --git a/x/genutil/collect_test.go b/x/genutil/collect_test.go
index 4971f00a4c..0b5a6681e5 100644
--- a/x/genutil/collect_test.go
+++ b/x/genutil/collect_test.go
@@ -14,11 +14,7 @@ import (
 // Ensures that CollectTx correctly traverses directories and won't error out on encountering
 // a directory during traversal of the first level. See issue https://github.com/cosmos/cosmos-sdk/issues/6788.
 func TestCollectTxsHandlesDirectories(t *testing.T) {
-	testDir, err := os.MkdirTemp(os.TempDir(), "testCollectTxs")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(testDir)
+	testDir := t.TempDir()
 
 	// 1. We'll insert a directory as the first element before JSON file.
 	subDirPath := filepath.Join(testDir, "_adir")