diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/HsOfficeScenarioTests.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/HsOfficeScenarioTests.java
index 056816d6..4f282055 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/HsOfficeScenarioTests.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/HsOfficeScenarioTests.java
@@ -321,7 +321,6 @@ class HsOfficeScenarioTests extends ScenarioTest {
     void shouldCreateMembershipForPartner() {
         new CreateMembership(this)
                 .given("partnerName", "Test AG")
-                .given("memberNumberSuffix", "00") // FIXME: move into CreateMembership
                 .given("validFrom", "2024-10-15")
                 .given("newStatus", "ACTIVE")
                 .given("membershipFeeBillable", "true")
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/CreateMembership.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/CreateMembership.java
index b7af4876..890dfedf 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/CreateMembership.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/CreateMembership.java
@@ -27,7 +27,7 @@ public class CreateMembership extends UseCase<CreateMembership> {
         return httpPost("/api/hs/office/memberships", usingJsonBody("""
                 {
                    "partner.uuid": ${Partner: %{partnerName}},
-                   "memberNumberSuffix": ${memberNumberSuffix},
+                   "memberNumberSuffix": ${%{memberNumberSuffix???}???00},
                    "status": "ACTIVE",
                    "validFrom": ${validFrom},
                    "membershipFeeBillable": ${membershipFeeBillable}