diff --git a/build/testing/integration/authz/auth.go b/build/testing/integration/authz/auth.go
index 95076ae542..14a8e65461 100644
--- a/build/testing/integration/authz/auth.go
+++ b/build/testing/integration/authz/auth.go
@@ -281,6 +281,9 @@ func (s clientCallSet) assert(t *testing.T, ctx context.Context, client sdk.SDK)
 type clientCall func(*testing.T, context.Context, sdk.SDK) error
 
 func GetNamespace(in *flipt.GetNamespaceRequest) clientCall {
+	if in.GetNamespaceKey() == "" {
+		in.Key = "default"
+	}
 	return func(t *testing.T, ctx context.Context, s sdk.SDK) error {
 		_, err := s.Flipt().GetNamespace(ctx, in)
 		return fmt.Errorf("GetNamespace: %w", err)
@@ -434,6 +437,7 @@ func CreateRollout(in *flipt.CreateRolloutRequest) clientCall {
 		return fmt.Errorf("CreateRollout: %w", err)
 	}
 }
+
 func UpdateRollout(in *flipt.UpdateRolloutRequest) clientCall {
 	return func(t *testing.T, ctx context.Context, s sdk.SDK) error {
 		_, err := s.Flipt().UpdateRollout(ctx, in)
diff --git a/rpc/flipt/request.go b/rpc/flipt/request.go
index 94fe0fde7d..0429b4d754 100644
--- a/rpc/flipt/request.go
+++ b/rpc/flipt/request.go
@@ -49,6 +49,12 @@ type Request struct {
 	Status    Status   `json:"status"`
 }
 
+func WithNoNamespace() func(*Request) {
+	return func(r *Request) {
+		r.Namespace = ""
+	}
+}
+
 func WithNamespace(ns string) func(*Request) {
 	return func(r *Request) {
 		if ns != "" {
@@ -98,7 +104,7 @@ func (req *GetNamespaceRequest) Request() []Request {
 }
 
 func (req *ListNamespaceRequest) Request() []Request {
-	return []Request{NewRequest(ResourceNamespace, ActionRead, WithNamespace(""))}
+	return []Request{NewRequest(ResourceNamespace, ActionRead, WithNoNamespace())}
 }
 
 func (req *CreateNamespaceRequest) Request() []Request {
diff --git a/rpc/flipt/request_test.go b/rpc/flipt/request_test.go
index b630ae488b..fec2e4c56b 100644
--- a/rpc/flipt/request_test.go
+++ b/rpc/flipt/request_test.go
@@ -8,5 +8,7 @@ import (
 
 func TestListNamespaceRequest_Request(t *testing.T) {
 	req := &ListNamespaceRequest{}
-	assert.Equal(t, []Request{NewRequest(ResourceNamespace, ActionRead)}, req.Request())
+	expected := NewRequest(ResourceNamespace, ActionRead)
+	expected.Namespace = ""
+	assert.Equal(t, []Request{expected}, req.Request())
 }