diff --git a/driver.go b/driver.go
index 04dc1b6..f4dd4e9 100644
--- a/driver.go
+++ b/driver.go
@@ -3,7 +3,7 @@ package main
 import (
 	"context"
 	"io/ioutil"
-	"os"
+	"path"
 	"time"
 
 	"go.etcd.io/bbolt"
@@ -20,12 +20,12 @@ type BBolt struct {
 	db *bbolt.DB
 }
 
-func NewTestDB() BBolt {
-	d, err := ioutil.TempDir(os.TempDir(), "test-db-*")
+func NewTestDBIn(d string) BBolt {
+	d, err := ioutil.TempDir(d, "test-db-*")
 	if err != nil {
 		panic(err)
 	}
-	db, err := NewDB(d)
+	db, err := NewDB(path.Join(d, "bb"))
 	if err != nil {
 		panic(err)
 	}
diff --git a/driver_test.go b/driver_test.go
index 6aeecd5..cc1c62b 100644
--- a/driver_test.go
+++ b/driver_test.go
@@ -4,18 +4,11 @@ import (
 	"context"
 	"errors"
 	"io"
-	"path"
 	"testing"
 )
 
 func TestDriverBBolt(t *testing.T) {
-	bb, err := NewDB(path.Join(t.TempDir(), "bb"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer bb.Close()
-
-	testDriver(t, bb)
+	testDriver(t, NewTestDBIn(t.TempDir()))
 }
 
 func testDriver(t *testing.T, d Driver) {
diff --git a/queue.go b/queue.go
index 09512c7..b41059d 100644
--- a/queue.go
+++ b/queue.go
@@ -11,8 +11,8 @@ type Queue struct {
 	driver Driver
 }
 
-func NewTestQueue() Queue {
-	return Queue{driver: NewTestDB()}
+func NewTestQueueIn(d string) Queue {
+	return Queue{driver: NewTestDBIn(d)}
 }
 
 func NewQueue(driver Driver) Queue {
diff --git a/queue_test.go b/queue_test.go
index 18d0329..f72eb74 100644
--- a/queue_test.go
+++ b/queue_test.go
@@ -2,7 +2,6 @@ package main
 
 import (
 	"context"
-	"path"
 	"strconv"
 	"testing"
 	"time"
@@ -12,10 +11,7 @@ func TestQueue(t *testing.T) {
 	ctx, can := context.WithTimeout(context.Background(), time.Second*10)
 	defer can()
 
-	db, err := NewDB(path.Join(t.TempDir(), "q"))
-	if err != nil {
-		t.Fatal(err)
-	}
+	db := NewTestDBIn(t.TempDir())
 	defer db.Close()
 
 	q := NewQueue(db)
diff --git a/storage.go b/storage.go
index c37a1fc..ed972c4 100644
--- a/storage.go
+++ b/storage.go
@@ -13,8 +13,8 @@ type Storage struct {
 	driver Driver
 }
 
-func NewTestStorage() Storage {
-	return Storage{driver: NewTestDB()}
+func NewTestStorageIn(d string) Storage {
+	return Storage{driver: NewTestDBIn(d)}
 }
 
 func NewStorage(driver Driver) Storage {
diff --git a/storage_test.go b/storage_test.go
new file mode 100644
index 0000000..a512bef
--- /dev/null
+++ b/storage_test.go
@@ -0,0 +1,6 @@
+package main
+
+import "testing"
+
+func TestStorage(t *testing.T) {
+}
diff --git a/writer.go b/writer.go
deleted file mode 100644
index fb613a7..0000000
--- a/writer.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package main
-
-type Writer struct{}