diff --git a/internal/repository/postgres_firewall_test.go b/internal/repository/postgres_firewall_test.go
index 3313350..9a18c49 100644
--- a/internal/repository/postgres_firewall_test.go
+++ b/internal/repository/postgres_firewall_test.go
@@ -8,6 +8,8 @@ import (
 	"evobgp/internal/authkey"
 	"evobgp/internal/db"
 	"evobgp/internal/store"
+
+	"github.com/google/uuid"
 )
 
 func TestPostgresFirewallClientCreateAndGetIntegration(t *testing.T) {
@@ -21,14 +23,17 @@ func TestPostgresFirewallClientCreateAndGetIntegration(t *testing.T) {
 		t.Fatal(err)
 	}
 	defer pool.Close()
-	pg, err := NewPostgres(ctx, pool, true)
+	pg, err := NewPostgres(ctx, pool, false)
 	if err != nil {
 		t.Fatal(err)
 	}
-	tenant, _, _, _, _ := pg.DemoIDs()
-	if tenant == "" {
-		t.Fatal("demo tenant required")
+	tenant := uuid.NewString()
+	if _, err := pool.Exec(ctx, `INSERT INTO tenant (id, name, slug) VALUES ($1, $2, $3)`, tenant, "firewall", "fw-"+tenant); err != nil {
+		t.Fatal(err)
 	}
+	t.Cleanup(func() {
+		_, _ = pool.Exec(context.Background(), `DELETE FROM tenant WHERE id = $1`, tenant)
+	})
 	tok := "evobgp_fw_pgtest_" + t.Name()
 	hash := authkey.HashToken(tok)
 	client, err := pg.CreateFirewallClient(tenant, &store.FirewallClientCreate{