diff --git a/sdm/src/test/java/integration/com/sap/cds/sdm/utils/cf-subscribe.sh b/sdm/src/test/java/integration/com/sap/cds/sdm/utils/cf-subscribe.sh
index 7454d1a7..0ab6a7fc 100755
--- a/sdm/src/test/java/integration/com/sap/cds/sdm/utils/cf-subscribe.sh
+++ b/sdm/src/test/java/integration/com/sap/cds/sdm/utils/cf-subscribe.sh
@@ -28,7 +28,7 @@ load_props "$CONFIG_FILE"
 # --- Resolve tenant-specific subaccount via ACTIVE_TENANT env var (1 or 2) ---
 TENANT_SUFFIX="${ACTIVE_TENANT:-1}"
 SUBACCOUNT_VAR="consumerSubaccountIdMT${TENANT_SUFFIX}"
-consumerSubaccountIdMT="${!SUBACCOUNT_VAR}"
+consumerSubaccountIdMT="${!SUBACCOUNT_VAR:-}"
 
 # --- Resolve consumer credentials ---
 CONSUMER_USER="${username}"
diff --git a/sdm/src/test/java/integration/com/sap/cds/sdm/utils/cf-unsubscribe.sh b/sdm/src/test/java/integration/com/sap/cds/sdm/utils/cf-unsubscribe.sh
index bb17edc4..7f9bf20f 100755
--- a/sdm/src/test/java/integration/com/sap/cds/sdm/utils/cf-unsubscribe.sh
+++ b/sdm/src/test/java/integration/com/sap/cds/sdm/utils/cf-unsubscribe.sh
@@ -28,7 +28,7 @@ load_props "$CONFIG_FILE"
 # --- Resolve tenant-specific subaccount via ACTIVE_TENANT env var (1 or 2) ---
 TENANT_SUFFIX="${ACTIVE_TENANT:-1}"
 SUBACCOUNT_VAR="consumerSubaccountIdMT${TENANT_SUFFIX}"
-consumerSubaccountIdMT="${!SUBACCOUNT_VAR}"
+consumerSubaccountIdMT="${!SUBACCOUNT_VAR:-}"
 
 # --- Resolve consumer credentials ---
 CONSUMER_USER="${username}"