diff --git a/rsciio/tests/hamamatsu_data/focus_mode.img b/rsciio/tests/data/hamamatsu/focus_mode.img
similarity index 100%
rename from rsciio/tests/hamamatsu_data/focus_mode.img
rename to rsciio/tests/data/hamamatsu/focus_mode.img
diff --git a/rsciio/tests/hamamatsu_data/operate_mode.img b/rsciio/tests/data/hamamatsu/operate_mode.img
similarity index 100%
rename from rsciio/tests/hamamatsu_data/operate_mode.img
rename to rsciio/tests/data/hamamatsu/operate_mode.img
diff --git a/rsciio/tests/hamamatsu_data/photon_counting.img b/rsciio/tests/data/hamamatsu/photon_counting.img
similarity index 100%
rename from rsciio/tests/hamamatsu_data/photon_counting.img
rename to rsciio/tests/data/hamamatsu/photon_counting.img
diff --git a/rsciio/tests/hamamatsu_data/shading_file.img b/rsciio/tests/data/hamamatsu/shading_file.img
similarity index 100%
rename from rsciio/tests/hamamatsu_data/shading_file.img
rename to rsciio/tests/data/hamamatsu/shading_file.img
diff --git a/rsciio/tests/registry.txt b/rsciio/tests/registry.txt
index 9445e054e..6f372aaf7 100644
--- a/rsciio/tests/registry.txt
+++ b/rsciio/tests/registry.txt
@@ -159,6 +159,10 @@
 'empad/map128x128_version1.2.0.xml' b1cd0dfedc348c9e03ac10e32e3b98a0a0502f87e72069423e7d5f78d40ccae5
 'empad/map4x4.xml' ff1a1a6488c7e525c1386f04d791bf77425e27b334c4301a9e6ec85c7628cbeb
 'empad/stack_images.xml' 7047717786c3773735ff751a3ca797325d7944fe7b70f110cdda55d455a38a55
+'hamamatsu/focus_mode.img' 9c6994e078e8daf941a6a46a0061a543405887e9f61f62618b01b0f754ce5c93
+'hamamatsu/operate_mode.img' 4833dd8e13dc908bf4a716708372ca51f2083a64f874cca0443fad4c03b289c3
+'hamamatsu/photon_counting.img' 899043b308fe736797060fea471acb733e7e23e1bc2367c1bed06c327d5a92ce
+'hamamatsu/shading_file.img' d075910ca724cd9c999c4d5391b61bfde20fd0ee5348e3836b1c5b1239324353
 'hspy/example1_v1.0.hdf5' 54ddd193e336b15909d33fcafdfec617f20e1d285a69d407beece83faa2df6fd
 'hspy/example1_v1.1.hdf5' 9dca0b4ffd196ca823d10770a2867c08c824ec8f36adfd77ebae6d1d61d5b203
 'hspy/example1_v1.2.hdf5' 03296024288ad12f04857abe4de3effa9420ef5609e606559f168e6e99354c5b
diff --git a/rsciio/tests/test_hamamatsu.py b/rsciio/tests/test_hamamatsu.py
index ec163d396..c9a619b0c 100644
--- a/rsciio/tests/test_hamamatsu.py
+++ b/rsciio/tests/test_hamamatsu.py
@@ -24,7 +24,7 @@
 
 hs = pytest.importorskip("hyperspy.api", reason="hyperspy not installed")
 
-testfile_dir = (Path(__file__).parent / "hamamatsu_data").resolve()
+testfile_dir = (Path(__file__).parent / "data" / "hamamatsu").resolve()
 
 testfile_focus_mode_path = (testfile_dir / "focus_mode.img").resolve()
 testfile_operate_mode_path = (testfile_dir / "operate_mode.img").resolve()