diff --git a/test/tz_test/custom_clock_casts.pass.cpp b/test/clock_cast_test/custom_clock.pass.cpp
similarity index 100%
rename from test/tz_test/custom_clock_casts.pass.cpp
rename to test/clock_cast_test/custom_clock.pass.cpp
diff --git a/test/tz_test/noncatsable_clock_casts.pass.cpp b/test/clock_cast_test/noncastable.pass.cpp
similarity index 100%
rename from test/tz_test/noncatsable_clock_casts.pass.cpp
rename to test/clock_cast_test/noncastable.pass.cpp
diff --git a/test/tz_test/clock_cast.pass.cpp b/test/clock_cast_test/normal_clocks.pass.cpp
similarity index 100%
rename from test/tz_test/clock_cast.pass.cpp
rename to test/clock_cast_test/normal_clocks.pass.cpp
diff --git a/test/tz_test/to_sys_return_int.fail.cpp b/test/clock_cast_test/to_sys_return_int.fail.cpp
similarity index 100%
rename from test/tz_test/to_sys_return_int.fail.cpp
rename to test/clock_cast_test/to_sys_return_int.fail.cpp
diff --git a/test/tz_test/to_sys_return_reference.cpp b/test/clock_cast_test/to_sys_return_reference.fail.cpp
similarity index 100%
rename from test/tz_test/to_sys_return_reference.cpp
rename to test/clock_cast_test/to_sys_return_reference.fail.cpp
diff --git a/test/tz_test/to_sys_return_utc_time.fail.cpp b/test/clock_cast_test/to_sys_return_utc_time.fail.cpp
similarity index 100%
rename from test/tz_test/to_sys_return_utc_time.fail.cpp
rename to test/clock_cast_test/to_sys_return_utc_time.fail.cpp