diff --git a/test/TEST-58-REPART/test.sh b/test/TEST-58-REPART/test.sh
index 7549de568c..d6e6ac0b22 100755
--- a/test/TEST-58-REPART/test.sh
+++ b/test/TEST-58-REPART/test.sh
@@ -4,6 +4,7 @@ set -e
 
 TEST_DESCRIPTION="test systemd-repart"
 IMAGE_NAME="repart"
+IMAGE_ADDITIONAL_ROOT_SIZE=1000
 TEST_FORCE_NEWIMAGE=1
 
 # shellcheck source=test/test-functions
diff --git a/test/test-functions b/test/test-functions
index 09e5e0d38e..5aa99522fc 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -1442,8 +1442,11 @@ create_empty_image() {
         fi
     fi
 
-    if [ "$IMAGE_NAME" = "repart" ]; then
-        root_size=$((root_size+=1000))
+    if [[ "${IMAGE_ADDITIONAL_ROOT_SIZE:-0}" -gt 0 ]]; then
+        root_size=$((root_size + IMAGE_ADDITIONAL_ROOT_SIZE))
+    fi
+    if [[ "${IMAGE_ADDITIONAL_DATA_SIZE:-0}" -gt 0 ]]; then
+        data_size=$((data_size + IMAGE_ADDITIONAL_DATA_SIZE))
     fi
 
     echo "Setting up ${IMAGE_PUBLIC:?} (${root_size} MB)"