diff --git a/reframe_tests/regression_checks/Test2DModelXY_e26f33ea.h5 b/reframe_tests/regression_checks/Test2DModelXY_e26f33ea/2D_EzHxHy.h5
similarity index 100%
rename from reframe_tests/regression_checks/Test2DModelXY_e26f33ea.h5
rename to reframe_tests/regression_checks/Test2DModelXY_e26f33ea/2D_EzHxHy.h5
diff --git a/reframe_tests/regression_checks/Test2DModelXZ_e21872c4.h5 b/reframe_tests/regression_checks/Test2DModelXZ_e21872c4/2D_EyHxHz.h5
similarity index 100%
rename from reframe_tests/regression_checks/Test2DModelXZ_e21872c4.h5
rename to reframe_tests/regression_checks/Test2DModelXZ_e21872c4/2D_EyHxHz.h5
diff --git a/reframe_tests/regression_checks/Test2DModelYZ_3e050c27.h5 b/reframe_tests/regression_checks/Test2DModelYZ_3e050c27/2D_ExHyHz.h5
similarity index 100%
rename from reframe_tests/regression_checks/Test2DModelYZ_3e050c27.h5
rename to reframe_tests/regression_checks/Test2DModelYZ_3e050c27/2D_ExHyHz.h5
diff --git a/reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1_snapshot_x_05.h5 b/reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1/snapshot_x_05.h5
similarity index 100%
rename from reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1_snapshot_x_05.h5
rename to reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1/snapshot_x_05.h5
diff --git a/reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1_snapshot_x_35.h5 b/reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1/snapshot_x_35.h5
similarity index 100%
rename from reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1_snapshot_x_35.h5
rename to reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1/snapshot_x_35.h5
diff --git a/reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1_snapshot_x_65.h5 b/reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1/snapshot_x_65.h5
similarity index 100%
rename from reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1_snapshot_x_65.h5
rename to reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1/snapshot_x_65.h5
diff --git a/reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1_snapshot_x_95.h5 b/reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1/snapshot_x_95.h5
similarity index 100%
rename from reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1_snapshot_x_95.h5
rename to reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1/snapshot_x_95.h5
diff --git a/reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1_snapshot_y_15.h5 b/reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1/snapshot_y_15.h5
similarity index 100%
rename from reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1_snapshot_y_15.h5
rename to reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1/snapshot_y_15.h5
diff --git a/reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1_snapshot_y_40.h5 b/reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1/snapshot_y_40.h5
similarity index 100%
rename from reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1_snapshot_y_40.h5
rename to reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1/snapshot_y_40.h5
diff --git a/reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1_snapshot_y_45.h5 b/reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1/snapshot_y_45.h5
similarity index 100%
rename from reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1_snapshot_y_45.h5
rename to reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1/snapshot_y_45.h5
diff --git a/reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1_snapshot_y_50.h5 b/reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1/snapshot_y_50.h5
similarity index 100%
rename from reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1_snapshot_y_50.h5
rename to reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1/snapshot_y_50.h5
diff --git a/reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1_snapshot_y_75.h5 b/reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1/snapshot_y_75.h5
similarity index 100%
rename from reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1_snapshot_y_75.h5
rename to reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1/snapshot_y_75.h5
diff --git a/reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1_snapshot_z_25.h5 b/reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1/snapshot_z_25.h5
similarity index 100%
rename from reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1_snapshot_z_25.h5
rename to reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1/snapshot_z_25.h5
diff --git a/reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1_snapshot_z_55.h5 b/reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1/snapshot_z_55.h5
similarity index 100%
rename from reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1_snapshot_z_55.h5
rename to reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1/snapshot_z_55.h5
diff --git a/reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1_snapshot_z_85.h5 b/reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1/snapshot_z_85.h5
similarity index 100%
rename from reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1_snapshot_z_85.h5
rename to reframe_tests/regression_checks/Test2DSliceSnapshot_061052b1/snapshot_z_85.h5
diff --git a/reframe_tests/regression_checks/Test2DSnapshot_c8b63c79_snapshot_0.h5 b/reframe_tests/regression_checks/Test2DSnapshot_c8b63c79/snapshot_0.h5
similarity index 100%
rename from reframe_tests/regression_checks/Test2DSnapshot_c8b63c79_snapshot_0.h5
rename to reframe_tests/regression_checks/Test2DSnapshot_c8b63c79/snapshot_0.h5
diff --git a/reframe_tests/regression_checks/Test2DSnapshot_c8b63c79_snapshot_1.h5 b/reframe_tests/regression_checks/Test2DSnapshot_c8b63c79/snapshot_1.h5
similarity index 100%
rename from reframe_tests/regression_checks/Test2DSnapshot_c8b63c79_snapshot_1.h5
rename to reframe_tests/regression_checks/Test2DSnapshot_c8b63c79/snapshot_1.h5
diff --git a/reframe_tests/regression_checks/Test2DSnapshot_c8b63c79_snapshot_2.h5 b/reframe_tests/regression_checks/Test2DSnapshot_c8b63c79/snapshot_2.h5
similarity index 100%
rename from reframe_tests/regression_checks/Test2DSnapshot_c8b63c79_snapshot_2.h5
rename to reframe_tests/regression_checks/Test2DSnapshot_c8b63c79/snapshot_2.h5
diff --git a/reframe_tests/regression_checks/Test2DSnapshot_c8b63c79_snapshot_3.h5 b/reframe_tests/regression_checks/Test2DSnapshot_c8b63c79/snapshot_3.h5
similarity index 100%
rename from reframe_tests/regression_checks/Test2DSnapshot_c8b63c79_snapshot_3.h5
rename to reframe_tests/regression_checks/Test2DSnapshot_c8b63c79/snapshot_3.h5
diff --git a/reframe_tests/regression_checks/TestBoxGeometryDefaultPml_0d642269.h5 b/reframe_tests/regression_checks/TestBoxGeometryDefaultPml_0d642269/box_full_model.h5
similarity index 100%
rename from reframe_tests/regression_checks/TestBoxGeometryDefaultPml_0d642269.h5
rename to reframe_tests/regression_checks/TestBoxGeometryDefaultPml_0d642269/box_full_model.h5
diff --git a/reframe_tests/regression_checks/TestBoxGeometryDefaultPml_3b4b184a.h5 b/reframe_tests/regression_checks/TestBoxGeometryDefaultPml_3b4b184a/box_outside_pml.h5
similarity index 100%
rename from reframe_tests/regression_checks/TestBoxGeometryDefaultPml_3b4b184a.h5
rename to reframe_tests/regression_checks/TestBoxGeometryDefaultPml_3b4b184a/box_outside_pml.h5
diff --git a/reframe_tests/regression_checks/TestBoxGeometryDefaultPml_a8674323.h5 b/reframe_tests/regression_checks/TestBoxGeometryDefaultPml_a8674323/box_single_rank_outside_pml.h5
similarity index 100%
rename from reframe_tests/regression_checks/TestBoxGeometryDefaultPml_a8674323.h5
rename to reframe_tests/regression_checks/TestBoxGeometryDefaultPml_a8674323/box_single_rank_outside_pml.h5
diff --git a/reframe_tests/regression_checks/TestBoxGeometryDefaultPml_ce6262f3.h5 b/reframe_tests/regression_checks/TestBoxGeometryDefaultPml_ce6262f3/box_half_model.h5
similarity index 100%
rename from reframe_tests/regression_checks/TestBoxGeometryDefaultPml_ce6262f3.h5
rename to reframe_tests/regression_checks/TestBoxGeometryDefaultPml_ce6262f3/box_half_model.h5
diff --git a/reframe_tests/regression_checks/TestBoxGeometryDefaultPml_f30e6d10.h5 b/reframe_tests/regression_checks/TestBoxGeometryDefaultPml_f30e6d10/box_single_rank.h5
similarity index 100%
rename from reframe_tests/regression_checks/TestBoxGeometryDefaultPml_f30e6d10.h5
rename to reframe_tests/regression_checks/TestBoxGeometryDefaultPml_f30e6d10/box_single_rank.h5
diff --git a/reframe_tests/regression_checks/TestBoxGeometryNoPml_0e734b72.h5 b/reframe_tests/regression_checks/TestBoxGeometryNoPml_0e734b72/box_full_model.h5
similarity index 100%
rename from reframe_tests/regression_checks/TestBoxGeometryNoPml_0e734b72.h5
rename to reframe_tests/regression_checks/TestBoxGeometryNoPml_0e734b72/box_full_model.h5
diff --git a/reframe_tests/regression_checks/TestBoxGeometryNoPml_0ebe9cc0.h5 b/reframe_tests/regression_checks/TestBoxGeometryNoPml_0ebe9cc0/box_half_model.h5
similarity index 100%
rename from reframe_tests/regression_checks/TestBoxGeometryNoPml_0ebe9cc0.h5
rename to reframe_tests/regression_checks/TestBoxGeometryNoPml_0ebe9cc0/box_half_model.h5
diff --git a/reframe_tests/regression_checks/TestBoxGeometryNoPml_7804157f.h5 b/reframe_tests/regression_checks/TestBoxGeometryNoPml_7804157f/box_single_rank.h5
similarity index 100%
rename from reframe_tests/regression_checks/TestBoxGeometryNoPml_7804157f.h5
rename to reframe_tests/regression_checks/TestBoxGeometryNoPml_7804157f/box_single_rank.h5
diff --git a/reframe_tests/regression_checks/TestDispersiveMaterials_99243fd2.h5 b/reframe_tests/regression_checks/TestDispersiveMaterials_99243fd2/hertzian_dipole_dispersive.h5
similarity index 100%
rename from reframe_tests/regression_checks/TestDispersiveMaterials_99243fd2.h5
rename to reframe_tests/regression_checks/TestDispersiveMaterials_99243fd2/hertzian_dipole_dispersive.h5
diff --git a/reframe_tests/regression_checks/TestEdgeGeometry_c4eb9ee8.h5 b/reframe_tests/regression_checks/TestEdgeGeometry_c4eb9ee8/antenna_wire_dipole_fs.h5
similarity index 100%
rename from reframe_tests/regression_checks/TestEdgeGeometry_c4eb9ee8.h5
rename to reframe_tests/regression_checks/TestEdgeGeometry_c4eb9ee8/antenna_wire_dipole_fs.h5
diff --git a/reframe_tests/regression_checks/TestHertzianDipoleSource_ca97d05d.h5 b/reframe_tests/regression_checks/TestHertzianDipoleSource_ca97d05d/hertzian_dipole_fs.h5
similarity index 100%
rename from reframe_tests/regression_checks/TestHertzianDipoleSource_ca97d05d.h5
rename to reframe_tests/regression_checks/TestHertzianDipoleSource_ca97d05d/hertzian_dipole_fs.h5
diff --git a/reframe_tests/regression_checks/TestMagneticDipoleSource_58b9b32a.h5 b/reframe_tests/regression_checks/TestMagneticDipoleSource_58b9b32a/magnetic_dipole_fs.h5
similarity index 100%
rename from reframe_tests/regression_checks/TestMagneticDipoleSource_58b9b32a.h5
rename to reframe_tests/regression_checks/TestMagneticDipoleSource_58b9b32a/magnetic_dipole_fs.h5
diff --git a/reframe_tests/regression_checks/TestSingleCellPml_c05c95d0.h5 b/reframe_tests/regression_checks/TestSingleCellPml_c05c95d0/single_cell_pml_2d.h5
similarity index 100%
rename from reframe_tests/regression_checks/TestSingleCellPml_c05c95d0.h5
rename to reframe_tests/regression_checks/TestSingleCellPml_c05c95d0/single_cell_pml_2d.h5
diff --git a/reframe_tests/regression_checks/TestSnapshot_8af76f0a_snapshot_0.h5 b/reframe_tests/regression_checks/TestSnapshot_8af76f0a/snapshot_0.h5
similarity index 100%
rename from reframe_tests/regression_checks/TestSnapshot_8af76f0a_snapshot_0.h5
rename to reframe_tests/regression_checks/TestSnapshot_8af76f0a/snapshot_0.h5
diff --git a/reframe_tests/regression_checks/TestSnapshot_8af76f0a_snapshot_1.h5 b/reframe_tests/regression_checks/TestSnapshot_8af76f0a/snapshot_1.h5
similarity index 100%
rename from reframe_tests/regression_checks/TestSnapshot_8af76f0a_snapshot_1.h5
rename to reframe_tests/regression_checks/TestSnapshot_8af76f0a/snapshot_1.h5
diff --git a/reframe_tests/regression_checks/TestSnapshot_8af76f0a_snapshot_2.h5 b/reframe_tests/regression_checks/TestSnapshot_8af76f0a/snapshot_2.h5
similarity index 100%
rename from reframe_tests/regression_checks/TestSnapshot_8af76f0a_snapshot_2.h5
rename to reframe_tests/regression_checks/TestSnapshot_8af76f0a/snapshot_2.h5
diff --git a/reframe_tests/regression_checks/TestSnapshot_8af76f0a_snapshot_3.h5 b/reframe_tests/regression_checks/TestSnapshot_8af76f0a/snapshot_3.h5
similarity index 100%
rename from reframe_tests/regression_checks/TestSnapshot_8af76f0a_snapshot_3.h5
rename to reframe_tests/regression_checks/TestSnapshot_8af76f0a/snapshot_3.h5
diff --git a/reframe_tests/regression_checks/TestSubgrids_36a9f022.h5 b/reframe_tests/regression_checks/TestSubgrids_36a9f022/cylinder_fs.h5
similarity index 100%
rename from reframe_tests/regression_checks/TestSubgrids_36a9f022.h5
rename to reframe_tests/regression_checks/TestSubgrids_36a9f022/cylinder_fs.h5
diff --git a/reframe_tests/regression_checks/TestTransmissionLineSource_ced17afa.h5 b/reframe_tests/regression_checks/TestTransmissionLineSource_ced17afa/transmission_line_fs.h5
similarity index 100%
rename from reframe_tests/regression_checks/TestTransmissionLineSource_ced17afa.h5
rename to reframe_tests/regression_checks/TestTransmissionLineSource_ced17afa/transmission_line_fs.h5