diff --git a/test/cases/000_build/000_outputs/000_kernel+initrd/test.sh b/test/cases/000_build/000_formats/000_kernel+initrd/test.sh
similarity index 100%
rename from test/cases/000_build/000_outputs/000_kernel+initrd/test.sh
rename to test/cases/000_build/000_formats/000_kernel+initrd/test.sh
diff --git a/test/cases/000_build/000_outputs/001_iso-bios/test.sh b/test/cases/000_build/000_formats/001_iso-bios/test.sh
similarity index 100%
rename from test/cases/000_build/000_outputs/001_iso-bios/test.sh
rename to test/cases/000_build/000_formats/001_iso-bios/test.sh
diff --git a/test/cases/000_build/000_outputs/002_iso-efi/test.sh b/test/cases/000_build/000_formats/002_iso-efi/test.sh
similarity index 100%
rename from test/cases/000_build/000_outputs/002_iso-efi/test.sh
rename to test/cases/000_build/000_formats/002_iso-efi/test.sh
diff --git a/test/cases/000_build/000_outputs/003_gcp/test.sh b/test/cases/000_build/000_formats/003_gcp/test.sh
similarity index 100%
rename from test/cases/000_build/000_outputs/003_gcp/test.sh
rename to test/cases/000_build/000_formats/003_gcp/test.sh
diff --git a/test/cases/000_build/000_outputs/004_aws/test.sh b/test/cases/000_build/000_formats/004_aws/test.sh
similarity index 100%
rename from test/cases/000_build/000_outputs/004_aws/test.sh
rename to test/cases/000_build/000_formats/004_aws/test.sh
diff --git a/test/cases/000_build/000_outputs/006_vhd/test.sh b/test/cases/000_build/000_formats/006_vhd/test.sh
similarity index 100%
rename from test/cases/000_build/000_outputs/006_vhd/test.sh
rename to test/cases/000_build/000_formats/006_vhd/test.sh
diff --git a/test/cases/000_build/000_outputs/007_vmdk/test.sh b/test/cases/000_build/000_formats/007_vmdk/test.sh
similarity index 100%
rename from test/cases/000_build/000_outputs/007_vmdk/test.sh
rename to test/cases/000_build/000_formats/007_vmdk/test.sh
diff --git a/test/cases/000_build/000_outputs/008_raw_bios/test.sh b/test/cases/000_build/000_formats/008_raw_bios/test.sh
similarity index 100%
rename from test/cases/000_build/000_outputs/008_raw_bios/test.sh
rename to test/cases/000_build/000_formats/008_raw_bios/test.sh
diff --git a/test/cases/000_build/000_outputs/009_raw_efi/test.sh b/test/cases/000_build/000_formats/009_raw_efi/test.sh
similarity index 100%
rename from test/cases/000_build/000_outputs/009_raw_efi/test.sh
rename to test/cases/000_build/000_formats/009_raw_efi/test.sh
diff --git a/test/cases/000_build/000_outputs/010_qcow2_bios/test.sh b/test/cases/000_build/000_formats/010_qcow2_bios/test.sh
similarity index 100%
rename from test/cases/000_build/000_outputs/010_qcow2_bios/test.sh
rename to test/cases/000_build/000_formats/010_qcow2_bios/test.sh
diff --git a/test/cases/000_build/000_outputs/test.yml b/test/cases/000_build/000_formats/test.yml
similarity index 100%
rename from test/cases/000_build/000_outputs/test.yml
rename to test/cases/000_build/000_formats/test.yml