diff --git a/tests/virshtest.c b/tests/virshtest.c
index b86c39285a..a7f62df563 100644
--- a/tests/virshtest.c
+++ b/tests/virshtest.c
@@ -352,6 +352,8 @@ mymain(void)
                  "checkpoint-create test --redefine checkpoint-c2.xml ;"
                  "checkpoint-info test c2");
 
+    DO_TEST_SCRIPT("script-friendly-options", NULL, VIRSH_CUSTOM);
+
     /* completion doesn't work on non-readline builds */
     need_readline = true;
 
diff --git a/tests/virshtestdata/script-friendly-options.in b/tests/virshtestdata/script-friendly-options.in
new file mode 100644
index 0000000000..08d2a87474
--- /dev/null
+++ b/tests/virshtestdata/script-friendly-options.in
@@ -0,0 +1,11 @@
+echo "Following script-friendly outputs of commands must not change"
+list --uuid;
+list --uuid --all;
+list --name;
+list --name --all;
+list --uuid --name --all;
+domstate fv0
+domstate fv0 --reason
+domname ef861801-45b9-11cb-88e3-afbfe5370493
+domid fv0
+domstats fv0
diff --git a/tests/virshtestdata/script-friendly-options.out b/tests/virshtestdata/script-friendly-options.out
new file mode 100644
index 0000000000..2ab1ba0e71
--- /dev/null
+++ b/tests/virshtestdata/script-friendly-options.out
@@ -0,0 +1,33 @@
+Following script-friendly outputs of commands must not change
+4dea22b3-1d52-d8f3-2516-782e98ab3fa0
+ef861801-45b9-11cb-88e3-afbfe5370493
+08721f99-3d1d-4aec-96eb-97803297bb36
+
+4dea22b3-1d52-d8f3-2516-782e98ab3fa0
+ef861801-45b9-11cb-88e3-afbfe5370493
+08721f99-3d1d-4aec-96eb-97803297bb36
+
+fv0
+fc4
+fc5
+
+fv0
+fc4
+fc5
+
+4dea22b3-1d52-d8f3-2516-782e98ab3fa0 fv0
+ef861801-45b9-11cb-88e3-afbfe5370493 fc4
+08721f99-3d1d-4aec-96eb-97803297bb36 fc5
+
+running
+
+running (unknown)
+
+fc4
+
+1
+
+Domain: 'fv0'
+  state.state=1
+  state.reason=0
+