diff --git a/stages/test/test_kickstart.py b/stages/test/test_kickstart.py
index 22a3b78ca3..00418d48c7 100644
--- a/stages/test/test_kickstart.py
+++ b/stages/test/test_kickstart.py
@@ -15,7 +15,42 @@
       "keyboard": "us",
       "timezone": "UTC",
       },
-     "lang en_US.UTF-8\nkeyboard us\ntimezone UTC"),
+     "lang en_US.UTF-8\nkeyboard us\ntimezone UTC",
+     ),
+    ({"zerombr": "true"}, "zerombr"),
+    ({"clearpart": {}}, "clearpart"),
+    ({"clearpart": {"all": True}}, "clearpart --all"),
+    ({"clearpart": {"drives": ["hda", "hdb"]}}, "clearpart --drives=hda,hdb",),
+    ({"clearpart": {"drives": ["hda"]}}, "clearpart --drives=hda"),
+    ({"clearpart": {"list": ["sda2", "sda3"]}}, "clearpart --list=sda2,sda3"),
+    ({"clearpart": {"list": ["sda2"]}}, "clearpart --list=sda2"),
+    ({"clearpart": {"disklabel": "some-label"}},
+     "clearpart --disklabel=some-label",
+     ),
+    ({"clearpart": {"linux": True}}, "clearpart --linux"),
+    ({"clearpart": {
+        "all": True,
+        "drives": ["hda", "hdb"],
+        "list": ["sda2", "sda3"],
+        "disklabel": "some-label",
+        "linux": True,
+    },
+    },
+        "clearpart --all --drives=hda,hdb --list=sda2,sda3 --disklabel=some-label --linux"),
+    ({"lang": "en_US.UTF-8",
+              "keyboard": "us",
+              "timezone": "UTC",
+              "zerombr": True,
+              "clearpart": {
+                  "all": True,
+                  "drives": [
+                      "sd*|hd*|vda",
+                      "/dev/vdc"
+                  ]
+              }
+      },
+        "lang en_US.UTF-8\nkeyboard us\ntimezone UTC\nzerombr\nclearpart --all --drives=sd*|hd*|vda,/dev/vdc",
+     ),
 ])
 def test_kickstart(tmp_path, test_input, expected):
     ks_stage_path = os.path.join(os.path.dirname(__file__), "../org.osbuild.kickstart")