diff --git a/meta-selftest/wic/overlayfs_etc.wks.in b/meta-selftest/files/wic/overlayfs_etc.wks.in
similarity index 100%
rename from meta-selftest/wic/overlayfs_etc.wks.in
rename to meta-selftest/files/wic/overlayfs_etc.wks.in
diff --git a/meta-selftest/wic/test_biosplusefi_plugin.wks b/meta-selftest/files/wic/test_biosplusefi_plugin.wks
similarity index 100%
rename from meta-selftest/wic/test_biosplusefi_plugin.wks
rename to meta-selftest/files/wic/test_biosplusefi_plugin.wks
diff --git a/meta-selftest/wic/test_efi_plugin.wks b/meta-selftest/files/wic/test_efi_plugin.wks
similarity index 100%
rename from meta-selftest/wic/test_efi_plugin.wks
rename to meta-selftest/files/wic/test_efi_plugin.wks
diff --git a/meta-selftest/wic/test_efi_plugin_plain_systemd-boot.wks b/meta-selftest/files/wic/test_efi_plugin_plain_systemd-boot.wks
similarity index 100%
rename from meta-selftest/wic/test_efi_plugin_plain_systemd-boot.wks
rename to meta-selftest/files/wic/test_efi_plugin_plain_systemd-boot.wks
diff --git a/meta-selftest/wic/test_empty_plugin.wks b/meta-selftest/files/wic/test_empty_plugin.wks
similarity index 100%
rename from meta-selftest/wic/test_empty_plugin.wks
rename to meta-selftest/files/wic/test_empty_plugin.wks
diff --git a/meta-selftest/wic/test_gpt_partition_name.wks b/meta-selftest/files/wic/test_gpt_partition_name.wks
similarity index 100%
rename from meta-selftest/wic/test_gpt_partition_name.wks
rename to meta-selftest/files/wic/test_gpt_partition_name.wks
diff --git a/meta-selftest/wic/test_rawcopy_plugin.wks.in b/meta-selftest/files/wic/test_rawcopy_plugin.wks.in
similarity index 100%
rename from meta-selftest/wic/test_rawcopy_plugin.wks.in
rename to meta-selftest/files/wic/test_rawcopy_plugin.wks.in
diff --git a/meta-selftest/wic/test_uefikernel.wks b/meta-selftest/files/wic/test_uefikernel.wks
similarity index 100%
rename from meta-selftest/wic/test_uefikernel.wks
rename to meta-selftest/files/wic/test_uefikernel.wks
diff --git a/meta-selftest/wic/wictestdisk.wks b/meta-selftest/files/wic/wictestdisk.wks
similarity index 100%
rename from meta-selftest/wic/wictestdisk.wks
rename to meta-selftest/files/wic/wictestdisk.wks