--- a/gfx/layers/apz/test/mochitest/mochitest.ini
+++ b/gfx/layers/apz/test/mochitest/mochitest.ini
@@ -34,15 +34,15 @@ skip-if = (os == 'android') || (os == 'b
 skip-if = (toolkit == 'windows') || (toolkit == 'cocoa')
 [test_scroll_inactive_flattened_frame.html]
 skip-if = (os == 'android') || (os == 'b2g') || (buildapp == 'mulet') # wheel events not supported on mobile; see bug 1164274 for mulet
 [test_scroll_inactive_bug1190112.html]
 skip-if = (os == 'android') || (os == 'b2g') || (buildapp == 'mulet') # wheel events not supported on mobile; see bug 1164274 for mulet
 [test_scroll_subframe_scrollbar.html]
 skip-if = (os == 'android') || (os == 'b2g') || (buildapp == 'mulet') # wheel events not supported on mobile; see bug 1164274 for mulet
 [test_frame_reconstruction.html]
-[test_tap.html]
+[test_group_touchevents.html]
 # Windows touch injection doesn't work in automation, but this test can be run locally on a windows touch device.
 # On OS X we don't support touch events at all.
 skip-if = (toolkit == 'windows') || (toolkit == 'cocoa')
-[test_scroll_window.html]
+[test_group_wheelevents.html]
 skip-if = (toolkit == 'android') # wheel events not supported on mobile
-[test_click.html]
+[test_group_mouseevents.html]

rename from gfx/layers/apz/test/mochitest/test_click.html
rename to gfx/layers/apz/test/mochitest/test_group_mouseevents.html

rename from gfx/layers/apz/test/mochitest/test_tap.html
rename to gfx/layers/apz/test/mochitest/test_group_touchevents.html

rename from gfx/layers/apz/test/mochitest/test_scroll_window.html
rename to gfx/layers/apz/test/mochitest/test_group_wheelevents.html