diff --git a/tools/test-case-generators/format-request-map.json b/tools/test-case-generators/format-request-map.json
index a68165fec..4b7a2e390 100644
--- a/tools/test-case-generators/format-request-map.json
+++ b/tools/test-case-generators/format-request-map.json
@@ -246,6 +246,47 @@
     "no-image-info": true,
     "overrides": {}
   },
+  "image-installer-with-users": {
+    "compose-request": {
+      "distro": "",
+      "arch": "",
+      "image-type": "image-installer",
+      "repositories": [],
+      "filename": "installer.iso",
+      "blueprint": {
+        "name": "image-installer-users",
+        "customizations": {
+          "user": [
+            {
+              "name": "user2",
+              "description": "description 2",
+              "password": "$6$BhyxFBgrEFh0VrPJ$MllG8auiU26x2pmzL4.1maHzPHrA.4gTdCvlATFp8HJU9UPee4zCS9BVl2HOzKaUYD/zEm8r/OF05F2icWB0K/",
+              "key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost",
+              "home": "/home/home2",
+              "shell": "/bin/sh",
+              "groups": [
+                "group1"
+              ],
+              "uid": 1020,
+              "gid": 1050
+            }
+          ],
+          "group": [
+            {
+              "name": "group1",
+              "gid": 1030
+            },
+            {
+              "name": "group2",
+              "gid": 1050
+            }
+          ]
+        }
+      }
+    },
+    "no-image-info": true,
+    "overrides": {}
+  },
   "edge-installer": {
     "compose-request": {
       "distro": "",
@@ -263,6 +304,52 @@
     "no-image-info": true,
     "overrides": {}
   },
+  "edge-installer-with-users": {
+    "compose-request": {
+      "distro": "",
+      "arch": "",
+      "image-type": "edge-installer",
+      "repositories": [],
+      "filename": "installer.iso",
+      "ostree": {
+        "ref": "test/edge",
+        "url": "http://edge.example.com/repo",
+        "parent": "test/edge"
+      },
+      "blueprint": {
+        "name": "edge-installer-users",
+        "customizations": {
+          "user": [
+            {
+              "name": "user2",
+              "description": "description 2",
+              "password": "$6$BhyxFBgrEFh0VrPJ$MllG8auiU26x2pmzL4.1maHzPHrA.4gTdCvlATFp8HJU9UPee4zCS9BVl2HOzKaUYD/zEm8r/OF05F2icWB0K/",
+              "key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost",
+              "home": "/home/home2",
+              "shell": "/bin/sh",
+              "groups": [
+                "group1"
+              ],
+              "uid": 1020,
+              "gid": 1050
+            }
+          ],
+          "group": [
+            {
+              "name": "group1",
+              "gid": 1030
+            },
+            {
+              "name": "group2",
+              "gid": 1050
+            }
+          ]
+        }
+      }
+    },
+    "no-image-info": true,
+    "overrides": {}
+  },
   "edge-simplified-installer": {
     "compose-request": {
       "distro": "",