diff --git a/handler-index_test.go b/handler-index_test.go
index e980b05b7e0d159c64bb849da3bfada5677590b4..688962b66a36b05576a1f7bf6747b1a6218c878c 100644
--- a/handler-index_test.go
+++ b/handler-index_test.go
@@ -8,7 +8,8 @@ import (
 	"testing"
 
 	"git.c3pb.de/gbe/invinoveritas/log"
-	"git.c3pb.de/gbe/invinoveritas/vino"
+	"git.c3pb.de/gbe/invinoveritas/storage"
+	"git.c3pb.de/gbe/invinoveritas/storage/query"
 )
 
 type testLogger struct {
@@ -20,24 +21,6 @@ func (tl testLogger) Log(vals ...interface{}) error {
 	return nil
 }
 
-type dummyStorage struct{}
-
-func (d dummyStorage) Store(ctx context.Context, v *vino.Vino) error {
-	return nil
-}
-
-func (d dummyStorage) StoreComment(ctx context.Context, v *vino.Vino, txt string) error {
-	return nil
-}
-
-func (d dummyStorage) DeleteComment(ctx context.Context, id int) error {
-	return nil
-}
-
-func (d dummyStorage) DeleteVino(ctx context.Context, id int) error {
-	return nil
-}
-
 func TestHandler_Index_Add(t *testing.T) {
 	w := httptest.NewRecorder()
 
@@ -47,10 +30,18 @@ func TestHandler_Index_Add(t *testing.T) {
 	r := httptest.NewRequest("POST", "/add", strings.NewReader(data.Encode()))
 	r.Header.Set("Content-Type", "application/x-www-form-urlencoded")
 
-	var h Handler
-
 	logger := testLogger{t}
 
+	db, err := storage.Open(context.Background(), ":memory:", logger)
+	if err != nil {
+		t.Fatal("unexpected error:", err)
+	}
+	defer db.Close()
+
+	h := Handler{
+		Q: query.New(db),
+	}
+
 	hdlr := log.Request(h.index(), logger)
 	hdlr.ServeHTTP(w, r)