diff --git a/tests/cli/test_compose_ext4-filesystem.sh b/tests/cli/test_compose_ext4-filesystem.sh
new file mode 100755
index 00000000..a3fe08e9
--- /dev/null
+++ b/tests/cli/test_compose_ext4-filesystem.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+# Note: execute this file from the project root directory
+
+#####
+#
+# Make sure an ext4-filesystem compose can be built without errors!
+# Note: according to existing test plan we're not going to validate
+# direct usage-scenarios for this image type!
+#
+#####
+
+. /usr/share/beakerlib/beakerlib.sh
+
+CLI="./src/bin/composer-cli"
+
+
+rlJournalStart
+    rlPhaseStartTest "compose start"
+        UUID=`$CLI compose start example-http-server ext4-filesystem`
+        rlAssertEquals "exit code should be zero" $? 0
+
+        UUID=`echo $UUID | cut -f 2 -d' '`
+    rlPhaseEnd
+
+    rlPhaseStartTest "compose finished"
+        if [ -n "$UUID" ]; then
+            until $CLI compose info $UUID | grep FINISHED; do
+                sleep 10
+                rlLogInfo "Waiting for compose to finish ..."
+            done;
+        else
+            rlFail "Compose UUID is empty!"
+        fi
+    rlPhaseEnd
+
+rlJournalEnd
+rlJournalPrintText
diff --git a/tests/cli/test_compose_partitioned-disk.sh b/tests/cli/test_compose_partitioned-disk.sh
new file mode 100755
index 00000000..ac6c315a
--- /dev/null
+++ b/tests/cli/test_compose_partitioned-disk.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+# Note: execute this file from the project root directory
+
+#####
+#
+# Make sure a partitioned-disk compose can be built without errors!
+# Note: according to existing test plan we're not going to validate
+# direct usage-scenarios for this image type!
+#
+#####
+
+. /usr/share/beakerlib/beakerlib.sh
+
+CLI="./src/bin/composer-cli"
+
+
+rlJournalStart
+    rlPhaseStartTest "compose start"
+        UUID=`$CLI compose start example-http-server partitioned-disk`
+        rlAssertEquals "exit code should be zero" $? 0
+
+        UUID=`echo $UUID | cut -f 2 -d' '`
+    rlPhaseEnd
+
+    rlPhaseStartTest "compose finished"
+        if [ -n "$UUID" ]; then
+            until $CLI compose info $UUID | grep FINISHED; do
+                sleep 10
+                rlLogInfo "Waiting for compose to finish ..."
+            done;
+        else
+            rlFail "Compose UUID is empty!"
+        fi
+    rlPhaseEnd
+
+rlJournalEnd
+rlJournalPrintText
diff --git a/tests/test_cli.sh b/tests/test_cli.sh
index eecea4ea..f121347a 100755
--- a/tests/test_cli.sh
+++ b/tests/test_cli.sh
@@ -23,6 +23,8 @@ done;
 # invoke cli/ tests
 ./tests/cli/test_blueprints_sanity.sh
 ./tests/cli/test_compose_sanity.sh
+./tests/cli/test_compose_ext4-filesystem.sh
+./tests/cli/test_compose_partitioned-disk.sh
 
 # Stop lorax-composer and remove /run/weldr/api.socket
 pkill -9 lorax-composer