diff --git a/broker/context_test.go b/broker/context_test.go
index 65337cfe..cd4feb5e 100644
--- a/broker/context_test.go
+++ b/broker/context_test.go
@@ -7,16 +7,31 @@ import (
 
 func TestFromContext(t *testing.T) {
 	ctx := context.WithValue(context.TODO(), brokerKey{}, NewBroker())
-
 	c, ok := FromContext(ctx)
 	if c == nil || !ok {
 		t.Fatal("FromContext not works")
 	}
 }
 
+func TestFromNilContext(t *testing.T) {
+	// nolint: staticcheck
+	c, ok := FromContext(nil)
+	if ok || c != nil {
+		t.Fatal("FromContext not works")
+	}
+}
+
 func TestNewContext(t *testing.T) {
 	ctx := NewContext(context.TODO(), NewBroker())
+	c, ok := FromContext(ctx)
+	if c == nil || !ok {
+		t.Fatal("NewContext not works")
+	}
+}
 
+func TestNewNilContext(t *testing.T) {
+	// nolint: staticcheck
+	ctx := NewContext(nil, NewBroker())
 	c, ok := FromContext(ctx)
 	if c == nil || !ok {
 		t.Fatal("NewContext not works")