diff --git a/pkg/api/api_test.go b/pkg/api/api_test.go
index 601bbfc7..854a10c5 100644
--- a/pkg/api/api_test.go
+++ b/pkg/api/api_test.go
@@ -14,8 +14,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/xmtp/example-notification-server-go/mocks"
 	"github.com/xmtp/example-notification-server-go/pkg/interfaces"
-	"github.com/xmtp/example-notification-server-go/pkg/logging"
 	"github.com/xmtp/example-notification-server-go/pkg/options"
+	"github.com/xmtp/example-notification-server-go/pkg/testutils"
 	proto "github.com/xmtp/example-notification-server-go/pkg/proto/notifications/v1"
 	protoconnect "github.com/xmtp/example-notification-server-go/pkg/proto/notifications/v1/notificationsv1connect"
 )
@@ -23,7 +23,6 @@ import (
 const INSTALLATION_ID = "install1"
 
 type testContext struct {
-	cleanup           func()
 	client            protoconnect.NotificationsClient
 	ctx               context.Context
 	httpClient        *http.Client
@@ -33,7 +32,8 @@ type testContext struct {
 }
 
 func setupTest(t *testing.T) testContext {
-	ctx := context.Background()
+	t.Helper()
+	ctx := t.Context()
 	listener, err := net.Listen("tcp", "127.0.0.1:0")
 	require.NoError(t, err)
 	port := listener.Addr().(*net.TCPAddr).Port
@@ -44,18 +44,17 @@ func setupTest(t *testing.T) testContext {
 			DisableKeepAlives: true,
 		},
 	}
-	apiServer := NewApiServer(logging.CreateLogger("console", "info"), options.ApiOptions{Port: port}, installationsMock, subscriptionsMock)
+	apiServer := NewApiServer(testutils.TestLogger(t), options.ApiOptions{Port: port}, installationsMock, subscriptionsMock)
 	require.NoError(t, apiServer.SetListener(listener))
 	apiServer.Start()
 	time.Sleep(50 * time.Millisecond)
 
-	cleanup := func() {
+	t.Cleanup(func() {
 		httpClient.CloseIdleConnections()
 		apiServer.Stop()
-	}
+	})
 
 	return testContext{
-		cleanup:           cleanup,
 		client:            protoconnect.NewNotificationsClient(httpClient, fmt.Sprintf("http://127.0.0.1:%d", port)),
 		ctx:               ctx,
 		httpClient:        httpClient,
@@ -67,7 +66,7 @@ func setupTest(t *testing.T) testContext {
 
 func Test_SetListenerAfterStartReturnsError(t *testing.T) {
 	apiServer := NewApiServer(
-		logging.CreateLogger("console", "info"),
+		testutils.TestLogger(t),
 		options.ApiOptions{Port: 18081},
 		mocks.NewInstallations(t),
 		mocks.NewSubscriptions(t),
@@ -87,7 +86,6 @@ func Test_SetListenerAfterStartReturnsError(t *testing.T) {
 
 func Test_RegisterInstallation(t *testing.T) {
 	ctx := setupTest(t)
-	defer ctx.cleanup()
 
 	deviceToken := "foo"
 	validUntil := time.Now()
@@ -118,7 +116,6 @@ func Test_RegisterInstallation(t *testing.T) {
 
 func Test_RegisterInstallationError(t *testing.T) {
 	ctx := setupTest(t)
-	defer ctx.cleanup()
 
 	ctx.installationsMock.On(
 		"Register",
@@ -142,7 +139,6 @@ func Test_RegisterInstallationError(t *testing.T) {
 
 func Test_DeleteInstallation(t *testing.T) {
 	ctx := setupTest(t)
-	defer ctx.cleanup()
 
 	ctx.installationsMock.On("Delete", mock.Anything, mock.Anything).
 		Return(nil)
@@ -165,7 +161,6 @@ func Test_DeleteInstallation(t *testing.T) {
 
 func Test_Subscribe(t *testing.T) {
 	ctx := setupTest(t)
-	defer ctx.cleanup()
 	topics := []string{"topic1"}
 
 	ctx.subscriptionsMock.On(
@@ -195,7 +190,6 @@ func Test_Subscribe(t *testing.T) {
 
 func Test_SubscribeError(t *testing.T) {
 	ctx := setupTest(t)
-	defer ctx.cleanup()
 
 	ctx.subscriptionsMock.On(
 		"Subscribe",
@@ -218,7 +212,6 @@ func Test_SubscribeError(t *testing.T) {
 
 func Test_Unsubscribe(t *testing.T) {
 	ctx := setupTest(t)
-	defer ctx.cleanup()
 	topics := []string{"topic1"}
 
 	ctx.subscriptionsMock.On(
diff --git a/pkg/db/db_test.go b/pkg/db/db_test.go
index 817c3dc8..7f3ad2b0 100644
--- a/pkg/db/db_test.go
+++ b/pkg/db/db_test.go
@@ -1,14 +1,13 @@
 package db_test
 
 import (
-	"context"
 	"database/sql"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/require"
 	database "github.com/xmtp/example-notification-server-go/pkg/db"
-	testdb "github.com/xmtp/example-notification-server-go/test"
+	testdb "github.com/xmtp/example-notification-server-go/pkg/testutils"
 )
 
 func TestMigrateFreshDatabase(t *testing.T) {
@@ -73,7 +72,7 @@ func TestMigrateExistingLegacySchema(t *testing.T) {
 	require.NoError(t, database.Migrate(t.Context(), db))
 
 	var version int
-	err := db.QueryRowContext(context.Background(), `SELECT version FROM schema_migrations`).Scan(&version)
+	err := db.QueryRowContext(t.Context(), `SELECT version FROM schema_migrations`).Scan(&version)
 	require.NoError(t, err)
 
 	latest, latestErr := database.LatestMigrationVersion()
@@ -113,7 +112,7 @@ func assertRelationExists(t *testing.T, db *sql.DB, name string) {
 	t.Helper()
 
 	var exists bool
-	err := db.QueryRowContext(context.Background(), `SELECT to_regclass($1) IS NOT NULL`, "public."+name).Scan(&exists)
+	err := db.QueryRowContext(t.Context(), `SELECT to_regclass($1) IS NOT NULL`, "public."+name).Scan(&exists)
 	require.NoError(t, err)
 	require.True(t, exists, name)
 }
diff --git a/pkg/delivery/http_test.go b/pkg/delivery/http_test.go
index e5d94f73..8ac8080c 100644
--- a/pkg/delivery/http_test.go
+++ b/pkg/delivery/http_test.go
@@ -8,7 +8,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/xmtp/example-notification-server-go/pkg/interfaces"
 	"github.com/xmtp/example-notification-server-go/pkg/options"
@@ -48,9 +47,9 @@ func TestHttpDelivery_SendSuccess(t *testing.T) {
 	server, d := testServerAndDelivery(t, countingHandler(&requestCount, http.StatusOK), 3, 10)
 	defer server.Close()
 
-	err := d.Send(context.Background(), newTestRequest())
+	err := d.Send(t.Context(), newTestRequest())
 	require.NoError(t, err)
-	assert.Equal(t, int32(1), atomic.LoadInt32(&requestCount))
+	require.Equal(t, int32(1), atomic.LoadInt32(&requestCount))
 }
 
 func TestHttpDelivery_RetryOnFailureThenSuccess(t *testing.T) {
@@ -65,9 +64,9 @@ func TestHttpDelivery_RetryOnFailureThenSuccess(t *testing.T) {
 	}, 3, 10)
 	defer server.Close()
 
-	err := d.Send(context.Background(), newTestRequest())
+	err := d.Send(t.Context(), newTestRequest())
 	require.NoError(t, err)
-	assert.Equal(t, int32(2), atomic.LoadInt32(&requestCount))
+	require.Equal(t, int32(2), atomic.LoadInt32(&requestCount))
 }
 
 func TestHttpDelivery_ExhaustsAttempts(t *testing.T) {
@@ -76,10 +75,10 @@ func TestHttpDelivery_ExhaustsAttempts(t *testing.T) {
 	server, d := testServerAndDelivery(t, countingHandler(&requestCount, http.StatusInternalServerError), maxAttempts, 10)
 	defer server.Close()
 
-	err := d.Send(context.Background(), newTestRequest())
+	err := d.Send(t.Context(), newTestRequest())
 	require.Error(t, err)
-	assert.Equal(t, "HTTP request failed", err.Error())
-	assert.Equal(t, int32(maxAttempts), atomic.LoadInt32(&requestCount))
+	require.Equal(t, "HTTP request failed", err.Error())
+	require.Equal(t, int32(maxAttempts), atomic.LoadInt32(&requestCount))
 }
 
 func TestHttpDelivery_ContextCancellation(t *testing.T) {
@@ -87,7 +86,7 @@ func TestHttpDelivery_ContextCancellation(t *testing.T) {
 	server, d := testServerAndDelivery(t, countingHandler(&requestCount, http.StatusInternalServerError), 5, 500)
 	defer server.Close()
 
-	ctx, cancel := context.WithCancel(context.Background())
+	ctx, cancel := context.WithCancel(t.Context())
 
 	done := make(chan error, 1)
 	go func() {
@@ -100,9 +99,9 @@ func TestHttpDelivery_ContextCancellation(t *testing.T) {
 
 	err := <-done
 	require.Error(t, err)
-	assert.Equal(t, context.Canceled, err)
+	require.Equal(t, context.Canceled, err)
 	// Should have made only 1 request before context was cancelled during backoff
-	assert.Equal(t, int32(1), atomic.LoadInt32(&requestCount))
+	require.Equal(t, int32(1), atomic.LoadInt32(&requestCount))
 }
 
 func TestHttpDelivery_DefaultConfig(t *testing.T) {
@@ -112,8 +111,8 @@ func TestHttpDelivery_DefaultConfig(t *testing.T) {
 		InitialRetryDelayMs: 250,
 	})
 
-	assert.Equal(t, 1, d.maxAttempts)
-	assert.Equal(t, 250*time.Millisecond, d.initialRetryDelay)
+	require.Equal(t, 1, d.maxAttempts)
+	require.Equal(t, 250*time.Millisecond, d.initialRetryDelay)
 }
 
 func TestHttpDelivery_ExponentialBackoff(t *testing.T) {
@@ -124,7 +123,7 @@ func TestHttpDelivery_ExponentialBackoff(t *testing.T) {
 	}, 4, 50)
 	defer server.Close()
 
-	_ = d.Send(context.Background(), newTestRequest())
+	_ = d.Send(t.Context(), newTestRequest())
 
 	// Should have 4 requests total (maxAttempts=4)
 	require.Len(t, timestamps, 4)
@@ -135,7 +134,7 @@ func TestHttpDelivery_ExponentialBackoff(t *testing.T) {
 		gap := timestamps[i].Sub(timestamps[i-1])
 		expectedDelay := time.Duration(50*(1<<uint(i-1))) * time.Millisecond
 		// Allow 30ms tolerance for test timing
-		assert.InDelta(t, expectedDelay.Milliseconds(), gap.Milliseconds(), 30,
+		require.InDelta(t, expectedDelay.Milliseconds(), gap.Milliseconds(), 30,
 			"gap between request %d and %d should be ~%v, got %v", i-1, i, expectedDelay, gap)
 	}
 }
@@ -145,10 +144,10 @@ func TestHttpDelivery_SingleAttempt(t *testing.T) {
 	server, d := testServerAndDelivery(t, countingHandler(&requestCount, http.StatusInternalServerError), 1, 10)
 	defer server.Close()
 
-	err := d.Send(context.Background(), newTestRequest())
+	err := d.Send(t.Context(), newTestRequest())
 	require.Error(t, err)
 	// With maxAttempts=1, only one attempt is made (no retries)
-	assert.Equal(t, int32(1), atomic.LoadInt32(&requestCount))
+	require.Equal(t, int32(1), atomic.LoadInt32(&requestCount))
 }
 
 func TestHttpDelivery_MaxAttemptsClampsToMinimumOne(t *testing.T) {
@@ -159,12 +158,12 @@ func TestHttpDelivery_MaxAttemptsClampsToMinimumOne(t *testing.T) {
 	})
 
 	// Value of 0 should be clamped to 1
-	assert.Equal(t, 1, d.maxAttempts)
+	require.Equal(t, 1, d.maxAttempts)
 }
 
 func TestHttpDelivery_CanDeliver(t *testing.T) {
 	d := NewHttpDelivery(zaptest.NewLogger(t), options.HttpDeliveryOptions{})
-	assert.True(t, d.CanDeliver(newTestRequest()))
+	require.True(t, d.CanDeliver(newTestRequest()))
 }
 
 func TestHttpDelivery_AuthHeader(t *testing.T) {
@@ -182,7 +181,7 @@ func TestHttpDelivery_AuthHeader(t *testing.T) {
 		InitialRetryDelayMs: 10,
 	})
 
-	err := d.Send(context.Background(), newTestRequest())
+	err := d.Send(t.Context(), newTestRequest())
 	require.NoError(t, err)
-	assert.Equal(t, "Bearer test-token", receivedAuth)
+	require.Equal(t, "Bearer test-token", receivedAuth)
 }
diff --git a/pkg/installations/installations_test.go b/pkg/installations/installations_test.go
index 093ad924..8af47fa1 100644
--- a/pkg/installations/installations_test.go
+++ b/pkg/installations/installations_test.go
@@ -8,9 +8,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 	"github.com/xmtp/example-notification-server-go/pkg/interfaces"
-	"github.com/xmtp/example-notification-server-go/pkg/logging"
 	"github.com/xmtp/example-notification-server-go/pkg/subscriptions"
-	"github.com/xmtp/example-notification-server-go/test"
+	"github.com/xmtp/example-notification-server-go/pkg/testutils"
 )
 
 const INSTALLATION_ID = "foo"
@@ -31,9 +30,10 @@ type storedDeliveryMechanism struct {
 	Token     string
 }
 
-func createService(db *sql.DB) interfaces.Installations {
+func createService(t *testing.T, db *sql.DB) interfaces.Installations {
+	t.Helper()
 	return NewInstallationsService(
-		logging.CreateLogger("console", "info"),
+		testutils.TestLogger(t),
 		db,
 	)
 }
@@ -89,10 +89,10 @@ func fetchInstallation(t *testing.T, ctx context.Context, db *sql.DB, installati
 }
 
 func Test_Register(t *testing.T) {
-	ctx := context.Background()
-	db := test.CreateTestDb(t)
+	ctx := t.Context()
+	db := testutils.CreateTestDb(t)
 
-	svc := createService(db)
+	svc := createService(t, db)
 	res, err := svc.Register(ctx, buildInstallation(INSTALLATION_ID, interfaces.APNS, TOKEN))
 
 	require.NoError(t, err)
@@ -106,9 +106,9 @@ func Test_Register(t *testing.T) {
 }
 
 func Test_RegisterDuplicate(t *testing.T) {
-	ctx := context.Background()
-	db := test.CreateTestDb(t)
-	svc := createService(db)
+	ctx := t.Context()
+	db := testutils.CreateTestDb(t)
+	svc := createService(t, db)
 
 	req := buildInstallation(INSTALLATION_ID, interfaces.APNS, TOKEN)
 	_, err := svc.Register(ctx, req)
@@ -127,9 +127,9 @@ func Test_RegisterDuplicate(t *testing.T) {
 }
 
 func Test_RegisterUpdate(t *testing.T) {
-	ctx := context.Background()
-	db := test.CreateTestDb(t)
-	svc := createService(db)
+	ctx := t.Context()
+	db := testutils.CreateTestDb(t)
+	svc := createService(t, db)
 
 	req1 := buildInstallation(INSTALLATION_ID, interfaces.APNS, "token1")
 	_, err := svc.Register(ctx, req1)
@@ -149,9 +149,9 @@ func Test_RegisterUpdate(t *testing.T) {
 }
 
 func Test_Delete(t *testing.T) {
-	ctx := context.Background()
-	db := test.CreateTestDb(t)
-	svc := createService(db)
+	ctx := t.Context()
+	db := testutils.CreateTestDb(t)
+	svc := createService(t, db)
 
 	_, err := svc.Register(ctx, buildInstallation(INSTALLATION_ID, interfaces.APNS, TOKEN))
 	require.NoError(t, err)
@@ -164,9 +164,9 @@ func Test_Delete(t *testing.T) {
 }
 
 func Test_DeleteAndRegisterAgain(t *testing.T) {
-	ctx := context.Background()
-	db := test.CreateTestDb(t)
-	svc := createService(db)
+	ctx := t.Context()
+	db := testutils.CreateTestDb(t)
+	svc := createService(t, db)
 
 	_, err := svc.Register(ctx, buildInstallation(INSTALLATION_ID, interfaces.APNS, TOKEN))
 	require.NoError(t, err)
@@ -182,9 +182,9 @@ func Test_DeleteAndRegisterAgain(t *testing.T) {
 }
 
 func Test_Get(t *testing.T) {
-	ctx := context.Background()
-	db := test.CreateTestDb(t)
-	svc := createService(db)
+	ctx := t.Context()
+	db := testutils.CreateTestDb(t)
+	svc := createService(t, db)
 
 	installationIDs := []string{"install1", "install2", "install3"}
 	for _, installationID := range installationIDs {
@@ -203,9 +203,9 @@ func Test_Get(t *testing.T) {
 }
 
 func Test_GetMultiple(t *testing.T) {
-	ctx := context.Background()
-	db := test.CreateTestDb(t)
-	svc := createService(db)
+	ctx := t.Context()
+	db := testutils.CreateTestDb(t)
+	svc := createService(t, db)
 
 	for _, token := range []string{"token1", "token2", "token3"} {
 		_, err := svc.Register(ctx, buildInstallation(INSTALLATION_ID, interfaces.APNS, token))
@@ -219,12 +219,12 @@ func Test_GetMultiple(t *testing.T) {
 }
 
 func Test_DeleteDeactivatesSubscriptions(t *testing.T) {
-	ctx := context.Background()
-	db := test.CreateTestDb(t)
+	ctx := t.Context()
+	db := testutils.CreateTestDb(t)
 
-	installSvc := createService(db)
+	installSvc := createService(t, db)
 	subSvc := subscriptions.NewSubscriptionsService(
-		logging.CreateLogger("console", "info"), db,
+		testutils.TestLogger(t), db,
 	)
 
 	_, err := installSvc.Register(ctx, buildInstallation(INSTALLATION_ID, interfaces.APNS, TOKEN))
@@ -243,9 +243,9 @@ func Test_DeleteDeactivatesSubscriptions(t *testing.T) {
 }
 
 func Test_GetDeleted(t *testing.T) {
-	ctx := context.Background()
-	db := test.CreateTestDb(t)
-	svc := createService(db)
+	ctx := t.Context()
+	db := testutils.CreateTestDb(t)
+	svc := createService(t, db)
 
 	_, err := svc.Register(ctx, buildInstallation(INSTALLATION_ID, interfaces.APNS, TOKEN))
 	require.NoError(t, err)
diff --git a/pkg/subscriptions/subscriptions_test.go b/pkg/subscriptions/subscriptions_test.go
index d4558972..49ecf4e7 100644
--- a/pkg/subscriptions/subscriptions_test.go
+++ b/pkg/subscriptions/subscriptions_test.go
@@ -8,8 +8,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 	"github.com/xmtp/example-notification-server-go/pkg/interfaces"
-	"github.com/xmtp/example-notification-server-go/pkg/logging"
-	"github.com/xmtp/example-notification-server-go/test"
+	"github.com/xmtp/example-notification-server-go/pkg/testutils"
 )
 
 const INSTALLATION_ID = "installation_1"
@@ -24,9 +23,10 @@ type storedSubscription struct {
 	IsSilent       bool
 }
 
-func createService(db *sql.DB) interfaces.Subscriptions {
+func createService(t *testing.T, db *sql.DB) interfaces.Subscriptions {
+	t.Helper()
 	return NewSubscriptionsService(
-		logging.CreateLogger("console", "info"),
+		testutils.TestLogger(t),
 		db,
 	)
 }
@@ -66,10 +66,10 @@ func fetchSubscriptions(t *testing.T, ctx context.Context, db *sql.DB, installat
 }
 
 func Test_Subscribe(t *testing.T) {
-	ctx := context.Background()
-	db := test.CreateTestDb(t)
+	ctx := t.Context()
+	db := testutils.CreateTestDb(t)
 
-	svc := createService(db)
+	svc := createService(t, db)
 
 	err := svc.Subscribe(ctx, INSTALLATION_ID, []string{TOPIC})
 	require.NoError(t, err)
@@ -82,9 +82,9 @@ func Test_Subscribe(t *testing.T) {
 }
 
 func Test_SubscribeMultiple(t *testing.T) {
-	ctx := context.Background()
-	db := test.CreateTestDb(t)
-	svc := createService(db)
+	ctx := t.Context()
+	db := testutils.CreateTestDb(t)
+	svc := createService(t, db)
 
 	topics := []string{"topic_1", "topic_2", "topic_3"}
 	err := svc.Subscribe(ctx, INSTALLATION_ID, topics)
@@ -100,9 +100,9 @@ func Test_SubscribeMultiple(t *testing.T) {
 }
 
 func Test_Unsubscribe(t *testing.T) {
-	ctx := context.Background()
-	db := test.CreateTestDb(t)
-	svc := createService(db)
+	ctx := t.Context()
+	db := testutils.CreateTestDb(t)
+	svc := createService(t, db)
 
 	err := svc.Subscribe(ctx, INSTALLATION_ID, []string{TOPIC})
 	require.NoError(t, err)
@@ -116,9 +116,9 @@ func Test_Unsubscribe(t *testing.T) {
 }
 
 func Test_UnsubscribeResubscribe(t *testing.T) {
-	ctx := context.Background()
-	db := test.CreateTestDb(t)
-	svc := createService(db)
+	ctx := t.Context()
+	db := testutils.CreateTestDb(t)
+	svc := createService(t, db)
 
 	require.NoError(t, svc.Subscribe(ctx, INSTALLATION_ID, []string{TOPIC}))
 	require.NoError(t, svc.Unsubscribe(ctx, INSTALLATION_ID, []string{TOPIC}))
@@ -130,9 +130,9 @@ func Test_UnsubscribeResubscribe(t *testing.T) {
 }
 
 func Test_SubscribeWithMetadata(t *testing.T) {
-	ctx := context.Background()
-	db := test.CreateTestDb(t)
-	svc := createService(db)
+	ctx := t.Context()
+	db := testutils.CreateTestDb(t)
+	svc := createService(t, db)
 
 	key := []byte("key")
 	err := svc.SubscribeWithMetadata(ctx, INSTALLATION_ID, []interfaces.SubscriptionInput{{
@@ -155,9 +155,9 @@ func Test_SubscribeWithMetadata(t *testing.T) {
 }
 
 func Test_UpdateIsSilent(t *testing.T) {
-	ctx := context.Background()
-	db := test.CreateTestDb(t)
-	svc := createService(db)
+	ctx := t.Context()
+	db := testutils.CreateTestDb(t)
+	svc := createService(t, db)
 
 	require.NoError(t, svc.SubscribeWithMetadata(ctx, INSTALLATION_ID, []interfaces.SubscriptionInput{{
 		Topic:    TOPIC,
@@ -181,9 +181,9 @@ func Test_UpdateIsSilent(t *testing.T) {
 }
 
 func Test_UpdateHmacKeys(t *testing.T) {
-	ctx := context.Background()
-	db := test.CreateTestDb(t)
-	svc := createService(db)
+	ctx := t.Context()
+	db := testutils.CreateTestDb(t)
+	svc := createService(t, db)
 
 	require.NoError(t, svc.SubscribeWithMetadata(ctx, INSTALLATION_ID, []interfaces.SubscriptionInput{{
 		Topic:    TOPIC,
@@ -210,9 +210,9 @@ func Test_UpdateHmacKeys(t *testing.T) {
 }
 
 func Test_GetSubscriptions(t *testing.T) {
-	ctx := context.Background()
-	db := test.CreateTestDb(t)
-	svc := createService(db)
+	ctx := t.Context()
+	db := testutils.CreateTestDb(t)
+	svc := createService(t, db)
 
 	require.NoError(t, svc.Subscribe(ctx, INSTALLATION_ID, []string{TOPIC}))
 
diff --git a/test/helpers.go b/pkg/testutils/db.go
similarity index 99%
rename from test/helpers.go
rename to pkg/testutils/db.go
index e2125852..8e20f615 100644
--- a/test/helpers.go
+++ b/pkg/testutils/db.go
@@ -1,4 +1,4 @@
-package test
+package testutils
 
 import (
 	"context"
diff --git a/pkg/testutils/logger.go b/pkg/testutils/logger.go
new file mode 100644
index 00000000..f5fd2097
--- /dev/null
+++ b/pkg/testutils/logger.go
@@ -0,0 +1,15 @@
+package testutils
+
+import (
+	"testing"
+
+	"go.uber.org/zap"
+	"go.uber.org/zap/zaptest"
+)
+
+// TestLogger returns a zap.Logger bound to the test lifecycle.
+// Output is captured by testing.T and only shown on failure.
+func TestLogger(t *testing.T) *zap.Logger {
+	t.Helper()
+	return zaptest.NewLogger(t)
+}
diff --git a/pkg/xmtp/listener_test.go b/pkg/xmtp/listener_test.go
index 7b541d16..a7d5c06f 100644
--- a/pkg/xmtp/listener_test.go
+++ b/pkg/xmtp/listener_test.go
@@ -11,11 +11,10 @@ import (
 	"github.com/xmtp/example-notification-server-go/mocks"
 	"github.com/xmtp/example-notification-server-go/pkg/installations"
 	"github.com/xmtp/example-notification-server-go/pkg/interfaces"
-	"github.com/xmtp/example-notification-server-go/pkg/logging"
 	"github.com/xmtp/example-notification-server-go/pkg/options"
 	v1 "github.com/xmtp/example-notification-server-go/pkg/proto/message_api/v1"
 	"github.com/xmtp/example-notification-server-go/pkg/subscriptions"
-	"github.com/xmtp/example-notification-server-go/test"
+	"github.com/xmtp/example-notification-server-go/pkg/testutils"
 )
 
 const (
@@ -27,10 +26,10 @@ const (
 )
 
 func buildTestListener(t *testing.T, deliveryService interfaces.Delivery) (*Listener, func()) {
-	logger := logging.CreateLogger("console", "info")
-	ctx, cancel := context.WithCancel(context.Background())
+	logger := testutils.TestLogger(t)
+	ctx, cancel := context.WithCancel(t.Context())
 	opts := options.XmtpOptions{ListenerEnabled: true, GrpcAddress: XMTP_ADDRESS, UseTls: false, NumWorkers: 5}
-	db := test.CreateTestDb(t)
+	db := testutils.CreateTestDb(t)
 	installations := installations.NewInstallationsService(logger, db)
 	subscriptions := subscriptions.NewSubscriptionsService(logger, db)
 
@@ -55,7 +54,7 @@ func injectMessage(listener *Listener, topic string, message []byte) {
 }
 
 func subscribeToTopic(t *testing.T, l *Listener, installationId, topic string, isSilent bool) {
-	_, err := l.installations.Register(context.Background(), interfaces.Installation{
+	_, err := l.installations.Register(t.Context(), interfaces.Installation{
 		Id: installationId,
 		DeliveryMechanism: interfaces.DeliveryMechanism{
 			Kind:  interfaces.APNS,
@@ -64,7 +63,7 @@ func subscribeToTopic(t *testing.T, l *Listener, installationId, topic string, i
 	})
 	require.NoError(t, err)
 
-	err = l.subscriptions.SubscribeWithMetadata(context.Background(), installationId, []interfaces.SubscriptionInput{{Topic: topic, IsSilent: isSilent}})
+	err = l.subscriptions.SubscribeWithMetadata(t.Context(), installationId, []interfaces.SubscriptionInput{{Topic: topic, IsSilent: isSilent}})
 	require.NoError(t, err)
 }