--- a/layout/style/test/mochitest.ini
+++ b/layout/style/test/mochitest.ini
@@ -46,37 +46,37 @@ support-files = additional_sheets_helper
 [test_align_shorthand_serialization.html]
 skip-if = stylo # bug 1339656
 [test_all_shorthand.html]
 [test_animations.html]
 skip-if = (toolkit == 'android')
 [test_animations_async_tests.html]
 support-files = Ahem.ttf file_animations_async_tests.html
 [test_animations_dynamic_changes.html]
-[test_animations_effect_timing_duration_to_rename.html]
+[test_animations_effect_timing_duration.html]
 skip-if = webrender # bug 1424752
-[test_animations_effect_timing_enddelay_to_rename.html]
+[test_animations_effect_timing_enddelay.html]
 skip-if = webrender # bug 1424752
-[test_animations_effect_timing_iterations_to_rename.html]
+[test_animations_effect_timing_iterations.html]
 skip-if = webrender # bug 1424752
 [test_animations_event_order.html]
 [test_animations_event_handler_attribute.html]
-[test_animations_iterationstart_to_rename.html]
+[test_animations_iterationstart.html]
 skip-if = webrender # bug 1424752
 [test_animations_omta.html]
 skip-if = webrender # bug 1424752
 [test_animations_omta_start.html]
 skip-if = webrender # bug 1424752
-[test_animations_pausing_to_rename.html]
+[test_animations_pausing.html]
 skip-if = webrender # bug 1424752
-[test_animations_playbackrate_to_rename.html]
+[test_animations_playbackrate.html]
 skip-if = webrender # bug 1424752
-[test_animations_reverse_to_rename.html]
+[test_animations_reverse.html]
 skip-if = webrender # bug 1424752
-[test_animations_styles_on_event_to_rename.html]
+[test_animations_styles_on_event.html]
 [test_animations_variable_changes.html]
 [test_animations_with_disabled_properties.html]
 support-files = file_animations_with_disabled_properties.html
 [test_any_dynamic.html]
 [test_asyncopen2.html]
 [test_at_rule_parse_serialize.html]
 [test_attribute_selector_eof_behavior.html]
 [test_background_blend_mode.html]
@@ -316,17 +316,17 @@ skip-if = !stylo
 [test_transitions_computed_value_combinations.html]
 [test_transitions_events.html]
 [test_transitions.html]
 skip-if = (android_version == '18' && debug) # bug 1159532
 [test_transitions_bug537151.html]
 [test_transitions_dynamic_changes.html]
 [test_transitions_per_property.html]
 skip-if = (toolkit == 'android') || webrender # bug 775227 for android, bug 1424752 for webrender
-[test_transitions_replacement_on_busy_frame_to_rename.html]
+[test_transitions_replacement_on_busy_frame.html]
 [test_transitions_step_functions.html]
 [test_transitions_with_disabled_properties.html]
 support-files = file_transitions_with_disabled_properties.html
 [test_unclosed_parentheses.html]
 [test_unicode_range_loading.html]
 support-files = ../../reftests/fonts/markA.woff ../../reftests/fonts/markB.woff ../../reftests/fonts/markC.woff ../../reftests/fonts/markD.woff
 [test_units_angle.html]
 [test_units_frequency.html]

rename from layout/style/test/test_animations_effect_timing_duration_to_rename.html
rename to layout/style/test/test_animations_effect_timing_duration.html

rename from layout/style/test/test_animations_effect_timing_enddelay_to_rename.html
rename to layout/style/test/test_animations_effect_timing_enddelay.html

rename from layout/style/test/test_animations_effect_timing_iterations_to_rename.html
rename to layout/style/test/test_animations_effect_timing_iterations.html

rename from layout/style/test/test_animations_iterationstart_to_rename.html
rename to layout/style/test/test_animations_iterationstart.html

rename from layout/style/test/test_animations_pausing_to_rename.html
rename to layout/style/test/test_animations_pausing.html

rename from layout/style/test/test_animations_playbackrate_to_rename.html
rename to layout/style/test/test_animations_playbackrate.html

rename from layout/style/test/test_animations_reverse_to_rename.html
rename to layout/style/test/test_animations_reverse.html

rename from layout/style/test/test_animations_styles_on_event_to_rename.html
rename to layout/style/test/test_animations_styles_on_event.html

rename from layout/style/test/test_transitions_replacement_on_busy_frame_to_rename.html
rename to layout/style/test/test_transitions_replacement_on_busy_frame.html