diff --git a/src/boot/hwids/device1.json b/src/boot/hwids/test/device1.json
similarity index 100%
rename from src/boot/hwids/device1.json
rename to src/boot/hwids/test/device1.json
diff --git a/src/boot/hwids/device2.json b/src/boot/hwids/test/device2.json
similarity index 100%
rename from src/boot/hwids/device2.json
rename to src/boot/hwids/test/device2.json
diff --git a/src/boot/hwids/device3.json b/src/boot/hwids/test/device3.json
similarity index 100%
rename from src/boot/hwids/device3.json
rename to src/boot/hwids/test/device3.json
diff --git a/src/boot/hwids/device4.json b/src/boot/hwids/test/device4.json
similarity index 100%
rename from src/boot/hwids/device4.json
rename to src/boot/hwids/test/device4.json
diff --git a/src/boot/meson.build b/src/boot/meson.build
index 3d1f66a658..ac84fbb89f 100644
--- a/src/boot/meson.build
+++ b/src/boot/meson.build
@@ -29,10 +29,10 @@ efi_fuzz_template = fuzz_template + efitest_base
 
 if conf.get('ENABLE_UKIFY') == 1
         test_hwids_section_c = custom_target(
-                input : ['hwids/device1.json', 'hwids/device2.json', 'hwids/device3.json', 'hwids/device4.json'],
+                input : ['hwids/test/device1.json', 'hwids/test/device2.json', 'hwids/test/device3.json', 'hwids/test/device4.json'],
                 output : 'test-hwids-section.c',
                 command : [files('generate-hwids-section.py'),
-                           meson.current_source_dir()/'hwids'],
+                           meson.current_source_dir()/'hwids/test'],
                 capture : true,
                 build_by_default : want_tests != 'false')
 else