client_test.go                        | 17 ++++-------------
 fs/torrentfs_test.go                  | 11 ++++-------
 issue97_test.go                       |  6 +-----
 metainfo/metainfo_test.go             |  4 +---
 storage/bolt-piece-completion_test.go |  6 +-----
 storage/file_test.go                  |  5 +----
 storage/issue95_test.go               | 13 ++-----------
 storage/issue96_test.go               |  6 +-----
 test/transfer_test.go                 |  8 ++------
 util/dirwatch/dirwatch_test.go        |  8 +-------

diff --git a/client_test.go b/client_test.go
index dc53f8e863ee5a127fcc2bc2d8c0858570088f59..a385521a1f89258e776bdddecbbb6d47254fa535 100644
--- a/client_test.go
+++ b/client_test.go
@@ -4,7 +4,6 @@ import (
 	"encoding/binary"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"reflect"
@@ -221,9 +220,7 @@ 	require.Nil(t, err)
 	defer seeder.Close()
 	seederTorrent, _, _ := seeder.AddTorrentSpec(TorrentSpecFromMetaInfo(mi))
 	seederTorrent.VerifyData()
-	leecherDataDir, err := ioutil.TempDir("", "")
-	require.Nil(t, err)
-	defer os.RemoveAll(leecherDataDir)
+	leecherDataDir := t.TempDir()
 	cfg = TestingConfig(t)
 	cfg.DataDir = leecherDataDir
 	leecher, err := NewClient(cfg)
@@ -264,9 +261,7 @@ 	require.Nil(t, err)
 	defer seeder.Close()
 	seederTorrent, _, _ := seeder.AddTorrentSpec(TorrentSpecFromMetaInfo(mi))
 	seederTorrent.VerifyData()
-	leecherDataDir, err := ioutil.TempDir("", "")
-	require.Nil(t, err)
-	defer os.RemoveAll(leecherDataDir)
+	leecherDataDir := t.TempDir()
 	cfg = TestingConfig(t)
 	cfg.DataDir = leecherDataDir
 	leecher, err := NewClient(cfg)
@@ -359,9 +354,7 @@ 	}
 }
 
 func testAddTorrentPriorPieceCompletion(t *testing.T, alreadyCompleted bool, csf func(*filecache.Cache) storage.ClientImpl) {
-	fileCacheDir, err := ioutil.TempDir("", "")
-	require.NoError(t, err)
-	defer os.RemoveAll(fileCacheDir)
+	fileCacheDir := t.TempDir()
 	fileCache, err := filecache.NewCache(fileCacheDir)
 	require.NoError(t, err)
 	greetingDataTempDir, greetingMetainfo := testutil.GreetingTestTorrent()
@@ -456,9 +449,7 @@ 	defer seeder.Close()
 	defer testutil.ExportStatusWriter(seeder, "s", t)()
 	seederTorrent, _, _ := seeder.AddTorrentSpec(TorrentSpecFromMetaInfo(mi))
 	seederTorrent.VerifyData()
-	leecherDataDir, err := ioutil.TempDir("", "")
-	require.NoError(t, err)
-	defer os.RemoveAll(leecherDataDir)
+	leecherDataDir := t.TempDir()
 	fc, err := filecache.NewCache(leecherDataDir)
 	require.NoError(t, err)
 	if ps.SetLeecherStorageCapacity {
diff --git a/fs/torrentfs_test.go b/fs/torrentfs_test.go
index 7e352eaf806c91590c16c30636c5669a0158e535..097f1bb2377449d1c4300e4d8496a1f90806ad11 100644
--- a/fs/torrentfs_test.go
+++ b/fs/torrentfs_test.go
@@ -62,11 +62,8 @@ func (tl *testLayout) Destroy() error {
 	return os.RemoveAll(tl.BaseDir)
 }
 
-func newGreetingLayout() (tl testLayout, err error) {
-	tl.BaseDir, err = ioutil.TempDir("", "torrentfs")
-	if err != nil {
-		return
-	}
+func newGreetingLayout(t *testing.T) (tl testLayout, err error) {
+	tl.BaseDir = t.TempDir()
 	tl.Completed = filepath.Join(tl.BaseDir, "completed")
 	os.Mkdir(tl.Completed, 0o777)
 	tl.MountDir = filepath.Join(tl.BaseDir, "mnt")
@@ -79,7 +76,7 @@
 // Unmount without first killing the FUSE connection while there are FUSE
 // operations blocked inside the filesystem code.
 func TestUnmountWedged(t *testing.T) {
-	layout, err := newGreetingLayout()
+	layout, err := newGreetingLayout(t)
 	require.NoError(t, err)
 	defer func() {
 		err := layout.Destroy()
@@ -161,7 +158,7 @@ 	assert.NoError(t, err)
 }
 
 func TestDownloadOnDemand(t *testing.T) {
-	layout, err := newGreetingLayout()
+	layout, err := newGreetingLayout(t)
 	require.NoError(t, err)
 	defer layout.Destroy()
 	cfg := torrent.NewDefaultClientConfig()
diff --git a/issue97_test.go b/issue97_test.go
index 04a2c4be4d5cc0e4703240fd87846016dd389309..09a18b15e363592a39916d4da84fe596251f2871 100644
--- a/issue97_test.go
+++ b/issue97_test.go
@@ -1,8 +1,6 @@
 package torrent
 
 import (
-	"io/ioutil"
-	"os"
 	"testing"
 
 	"github.com/anacrolix/log"
@@ -13,9 +11,7 @@ 	"github.com/anacrolix/torrent/storage"
 )
 
 func TestHashPieceAfterStorageClosed(t *testing.T) {
-	td, err := ioutil.TempDir("", "")
-	require.NoError(t, err)
-	defer os.RemoveAll(td)
+	td := t.TempDir()
 	tt := &Torrent{
 		storageOpener: storage.NewClient(storage.NewFile(td)),
 		logger:        log.Default,
diff --git a/metainfo/metainfo_test.go b/metainfo/metainfo_test.go
index 84aec2123f1adb9557d5cb85e96d261c24ffc427..ee01c505ec68d6b4763b306eaee7f88c602fa62f 100644
--- a/metainfo/metainfo_test.go
+++ b/metainfo/metainfo_test.go
@@ -85,9 +85,7 @@ 	return
 }
 
 func TestBuildFromFilePathOrder(t *testing.T) {
-	td, err := ioutil.TempDir("", "anacrolix")
-	require.NoError(t, err)
-	defer os.RemoveAll(td)
+	td := t.TempDir()
 	require.NoError(t, touchFile(filepath.Join(td, "b")))
 	require.NoError(t, touchFile(filepath.Join(td, "a")))
 	info := Info{
diff --git a/storage/bolt-piece-completion_test.go b/storage/bolt-piece-completion_test.go
index 53fdbdb590a27a7e26c8c233779e7b10a7ae8acc..3a778a86a98576301efee8da9374647af8cf001a 100644
--- a/storage/bolt-piece-completion_test.go
+++ b/storage/bolt-piece-completion_test.go
@@ -1,8 +1,6 @@
 package storage
 
 import (
-	"io/ioutil"
-	"os"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -12,9 +10,7 @@ 	"github.com/anacrolix/torrent/metainfo"
 )
 
 func TestBoltPieceCompletion(t *testing.T) {
-	td, err := ioutil.TempDir("", "")
-	require.NoError(t, err)
-	defer os.RemoveAll(td)
+	td := t.TempDir()
 
 	pc, err := NewBoltPieceCompletion(td)
 	require.NoError(t, err)
diff --git a/storage/file_test.go b/storage/file_test.go
index 482af90484cc70184d4f78bb6321c3458120bfad..604db70144c53beeb80ec9321787e4a31efca6bb 100644
--- a/storage/file_test.go
+++ b/storage/file_test.go
@@ -3,7 +3,6 @@
 import (
 	"bytes"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
@@ -16,9 +15,7 @@ 	"github.com/anacrolix/torrent/metainfo"
 )
 
 func TestShortFile(t *testing.T) {
-	td, err := ioutil.TempDir("", "")
-	require.NoError(t, err)
-	defer os.RemoveAll(td)
+	td := t.TempDir()
 	s := NewFile(td)
 	info := &metainfo.Info{
 		Name:        "a",
diff --git a/storage/issue95_test.go b/storage/issue95_test.go
index 4762d80e105b58d3c34a740320fc162d21c537f0..bda208699fe1df032212a9eb6c29ea8c9be0c229 100644
--- a/storage/issue95_test.go
+++ b/storage/issue95_test.go
@@ -1,8 +1,6 @@
 package storage
 
 import (
-	"io/ioutil"
-	"os"
 	"testing"
 
 	"github.com/anacrolix/missinggo/v2/resource"
@@ -33,22 +31,15 @@ 	assert.NotPanics(t, func() { t2p.Completion() })
 }
 
 func TestIssue95File(t *testing.T) {
-	td, err := ioutil.TempDir("", "")
-	require.NoError(t, err)
-	defer os.RemoveAll(td)
+	td := t.TempDir()
 	testIssue95(t, NewFile(td))
 }
 
 func TestIssue95MMap(t *testing.T) {
-	td, err := ioutil.TempDir("", "")
-	require.NoError(t, err)
-	defer os.RemoveAll(td)
+	td := t.TempDir()
 	testIssue95(t, NewMMap(td))
 }
 
 func TestIssue95ResourcePieces(t *testing.T) {
-	td, err := ioutil.TempDir("", "")
-	require.NoError(t, err)
-	defer os.RemoveAll(td)
 	testIssue95(t, NewResourcePieces(resource.OSFileProvider{}))
 }
diff --git a/storage/issue96_test.go b/storage/issue96_test.go
index 50356c7aada5eb71043b249cc30e3df2d3f7251d..d06b302b5039b5c653371678776e015170b2b74a 100644
--- a/storage/issue96_test.go
+++ b/storage/issue96_test.go
@@ -1,8 +1,6 @@
 package storage
 
 import (
-	"io/ioutil"
-	"os"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -11,9 +9,7 @@ 	"github.com/anacrolix/torrent/metainfo"
 )
 
 func testMarkedCompleteMissingOnRead(t *testing.T, csf func(string) ClientImplCloser) {
-	td, err := ioutil.TempDir("", "")
-	require.NoError(t, err)
-	defer os.RemoveAll(td)
+	td := t.TempDir()
 	cs := NewClient(csf(td))
 	info := &metainfo.Info{
 		PieceLength: 1,
diff --git a/test/transfer_test.go b/test/transfer_test.go
index 3e3f77a7f747fc4b7b64257d39a1b7aec95dfb0e..2e16b575976dd3f8d8e2c4c8132efe5a6481b79d 100644
--- a/test/transfer_test.go
+++ b/test/transfer_test.go
@@ -397,9 +397,7 @@ 	seederTorrent.VerifyData()
 
 	cfg = torrent.TestingConfig(t)
 	cfg.Seed = true
-	cfg.DataDir, err = ioutil.TempDir("", "")
-	require.NoError(t, err)
-	defer os.RemoveAll(cfg.DataDir)
+	cfg.DataDir = t.TempDir()
 	leecher, err := torrent.NewClient(cfg)
 	require.NoError(t, err)
 	defer leecher.Close()
@@ -407,9 +405,7 @@ 	defer testutil.ExportStatusWriter(leecher, "l", t)()
 
 	cfg = torrent.TestingConfig(t)
 	cfg.Seed = false
-	cfg.DataDir, err = ioutil.TempDir("", "")
-	require.NoError(t, err)
-	defer os.RemoveAll(cfg.DataDir)
+	cfg.DataDir = t.TempDir()
 	leecherLeecher, _ := torrent.NewClient(cfg)
 	require.NoError(t, err)
 	defer leecherLeecher.Close()
diff --git a/util/dirwatch/dirwatch_test.go b/util/dirwatch/dirwatch_test.go
index 220f58b5dc429d8afde6ea7ccd9b6f3aa0a741a5..04475994b5fcf9369872f23ccdb6e851284839fc 100644
--- a/util/dirwatch/dirwatch_test.go
+++ b/util/dirwatch/dirwatch_test.go
@@ -1,19 +1,13 @@
 package dirwatch
 
 import (
-	"io/ioutil"
-	"os"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 )
 
 func TestDirwatch(t *testing.T) {
-	tempDirName, err := ioutil.TempDir("", "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tempDirName)
+	tempDirName := t.TempDir()
 	t.Logf("tempdir: %q", tempDirName)
 	dw, err := New(tempDirName)
 	require.NoError(t, err)