.gitignore                | 1 -
 client_test.go            | 4 ++++
 storage/safe-path_test.go | 2 +-

diff --git a/.gitignore b/.gitignore
index 873a6b5196a5c45de003b526218e8c18f06ab72c..485dee64bcfb48793379b200a1afd14e85a8aaf4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-.torrent.bolt.db
 .idea
diff --git a/client_test.go b/client_test.go
index a8192eb1dd5d89df05f2925ab792bc71359aa8a9..c626ff890ddedaf0b8346a2abc604c84351cb06d 100644
--- a/client_test.go
+++ b/client_test.go
@@ -35,6 +35,10 @@ 	cl.Close()
 }
 
 func TestClientNilConfig(t *testing.T) {
+	// The default config will put crap in the working directory.
+	origDir, _ := os.Getwd()
+	defer os.Chdir(origDir)
+	os.Chdir(t.TempDir())
 	cl, err := NewClient(nil)
 	require.NoError(t, err)
 	cl.Close()
diff --git a/storage/safe-path_test.go b/storage/safe-path_test.go
index e12d3333cdb5d626d89934d50aa01b88eb09a888..008cf8a73073bba9853b97495c3cbe1cfca5825c 100644
--- a/storage/safe-path_test.go
+++ b/storage/safe-path_test.go
@@ -54,7 +54,7 @@ 					{Path: _case.input},
 				},
 			}
 			client := NewFileOpts(NewFileClientOpts{
-				ClientBaseDir: "somedir",
+				ClientBaseDir: t.TempDir(),
 			})
 			defer func() { c.Check(client.Close(), qt.IsNil) }()
 			torImpl, err := client.OpenTorrent(&info, metainfo.Hash{})