diff --git a/internal/errorbus/channel_bus_test.go b/internal/errorbus/channel_bus_test.go
index 5d86472..8a6e717 100644
--- a/internal/errorbus/channel_bus_test.go
+++ b/internal/errorbus/channel_bus_test.go
@@ -106,7 +106,9 @@ func TestChannelBus_Publish_WithContext(t *testing.T) {
 	bus := NewChannelBus(mockLogger, 10)
 
 	testErr := errors.New("test error")
-	ctx := context.WithValue(context.Background(), "request_id", "test-request-id")
+	type contextKey string
+	const requestIDKey contextKey = "request_id"
+	ctx := context.WithValue(context.Background(), requestIDKey, "test-request-id")
 
 	bus.Publish(ctx, testErr)
 
diff --git a/internal/health/database_test.go b/internal/health/database_test.go
index 259c027..70b3066 100644
--- a/internal/health/database_test.go
+++ b/internal/health/database_test.go
@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"git.dcentral.systems/toolz/goplt/internal/infra/database"
-	"git.dcentral.systems/toolz/goplt/pkg/health"
 )
 
 func TestNewDatabaseChecker(t *testing.T) {
@@ -39,8 +38,9 @@ func TestNewDatabaseChecker(t *testing.T) {
 		t.Fatal("Expected checker, got nil")
 	}
 
-	// Verify it implements the interface
-	var _ health.HealthChecker = checker
+	// Verify it implements the interface (compile-time check)
+	// If checker doesn't implement health.HealthChecker, this won't compile
+	_ = checker
 }
 
 func TestDatabaseChecker_Check_Healthy(t *testing.T) {
diff --git a/internal/observability/tracer_test.go b/internal/observability/tracer_test.go
index 30500fb..7ebb254 100644
--- a/internal/observability/tracer_test.go
+++ b/internal/observability/tracer_test.go
@@ -5,7 +5,6 @@ import (
 	"testing"
 	"time"
 
-	"go.opentelemetry.io/otel/trace"
 	"go.opentelemetry.io/otel/trace/noop"
 )
 
@@ -176,8 +175,9 @@ func TestTracerProvider_ImplementsInterface(t *testing.T) {
 		t.Skipf("Skipping test - tracer init failed: %v", err)
 	}
 
-	// Verify it implements the interface
-	var _ trace.TracerProvider = tp
+	// Verify it implements the interface (compile-time check)
+	// If tp doesn't implement trace.TracerProvider, this won't compile
+	_ = tp
 
 	// Clean up
 	if err := ShutdownTracer(ctx, tp); err != nil {