diff --git a/test/cases/ami_empty_blueprint.json b/test/cases/f30-x86_64-ami-boot.json
similarity index 100%
rename from test/cases/ami_empty_blueprint.json
rename to test/cases/f30-x86_64-ami-boot.json
diff --git a/test/cases/ext4_local_boot.json b/test/cases/f30-x86_64-ext4_filesystem-boot.json
similarity index 100%
rename from test/cases/ext4_local_boot.json
rename to test/cases/f30-x86_64-ext4_filesystem-boot.json
diff --git a/test/cases/openstack_local_boot.json b/test/cases/f30-x86_64-openstack-boot.json
similarity index 100%
rename from test/cases/openstack_local_boot.json
rename to test/cases/f30-x86_64-openstack-boot.json
diff --git a/test/cases/disk_local_boot.json b/test/cases/f30-x86_64-partitioned_disk-boot.json
similarity index 100%
rename from test/cases/disk_local_boot.json
rename to test/cases/f30-x86_64-partitioned_disk-boot.json
diff --git a/test/cases/qcow2_local_boot.json b/test/cases/f30-x86_64-qcow2-boot.json
similarity index 100%
rename from test/cases/qcow2_local_boot.json
rename to test/cases/f30-x86_64-qcow2-boot.json
diff --git a/test/cases/tar_local_boot.json b/test/cases/f30-x86_64-tar-boot.json
similarity index 100%
rename from test/cases/tar_local_boot.json
rename to test/cases/f30-x86_64-tar-boot.json
diff --git a/test/cases/vhd_local_boot.json b/test/cases/f30-x86_64-vhd-boot.json
similarity index 100%
rename from test/cases/vhd_local_boot.json
rename to test/cases/f30-x86_64-vhd-boot.json
diff --git a/test/cases/vmdk_local_boot.json b/test/cases/f30-x86_64-vmdk-boot.json
similarity index 100%
rename from test/cases/vmdk_local_boot.json
rename to test/cases/f30-x86_64-vmdk-boot.json