diff --git a/tests/patterns/test_data/16b-2ch-44100hz.aac b/tests/patterns/test_data/adts.hexpat.aac
similarity index 100%
rename from tests/patterns/test_data/16b-2ch-44100hz.aac
rename to tests/patterns/test_data/adts.hexpat.aac
diff --git a/tests/patterns/test_data/MC-TU033PreRelease_savegameDecompressed.dat b/tests/patterns/test_data/lcesave.hexpat/MC-TU033PreRelease_savegameDecompressed.dat
similarity index 100%
rename from tests/patterns/test_data/MC-TU033PreRelease_savegameDecompressed.dat
rename to tests/patterns/test_data/lcesave.hexpat/MC-TU033PreRelease_savegameDecompressed.dat
diff --git a/tests/patterns/test_data/MC-TU5-Release_savegameDecompressed.dat b/tests/patterns/test_data/lcesave.hexpat/MC-TU5-Release_savegameDecompressed.dat
similarity index 100%
rename from tests/patterns/test_data/MC-TU5-Release_savegameDecompressed.dat
rename to tests/patterns/test_data/lcesave.hexpat/MC-TU5-Release_savegameDecompressed.dat
diff --git a/tests/patterns/test_data/maxsave.dta b/tests/patterns/test_data/max_v104.hexpat.dta
similarity index 100%
rename from tests/patterns/test_data/maxsave.dta
rename to tests/patterns/test_data/max_v104.hexpat.dta
diff --git a/tests/patterns/test_data/notepad-windowstate.hexpat.bin b/tests/patterns/test_data/notepadwindowstate.hexpat.bin
similarity index 100%
rename from tests/patterns/test_data/notepad-windowstate.hexpat.bin
rename to tests/patterns/test_data/notepadwindowstate.hexpat.bin
diff --git a/tests/patterns/test_data/bigtiff-be-tiled.tiff b/tests/patterns/test_data/tiff.hexpat/bigtiff-be-tiled.tiff
similarity index 100%
rename from tests/patterns/test_data/bigtiff-be-tiled.tiff
rename to tests/patterns/test_data/tiff.hexpat/bigtiff-be-tiled.tiff
diff --git a/tests/patterns/test_data/bigtiff-le-stripped.tiff b/tests/patterns/test_data/tiff.hexpat/bigtiff-le-stripped.tiff
similarity index 100%
rename from tests/patterns/test_data/bigtiff-le-stripped.tiff
rename to tests/patterns/test_data/tiff.hexpat/bigtiff-le-stripped.tiff
diff --git a/tests/patterns/test_data/classic-be-stripped.tiff b/tests/patterns/test_data/tiff.hexpat/classic-be-stripped.tiff
similarity index 100%
rename from tests/patterns/test_data/classic-be-stripped.tiff
rename to tests/patterns/test_data/tiff.hexpat/classic-be-stripped.tiff
diff --git a/tests/patterns/test_data/classic-le-tiled.tiff b/tests/patterns/test_data/tiff.hexpat/classic-le-tiled.tiff
similarity index 100%
rename from tests/patterns/test_data/classic-le-tiled.tiff
rename to tests/patterns/test_data/tiff.hexpat/classic-le-tiled.tiff