diff --git a/test/.gitignore b/test/.gitignore
index 86e687fc7..48e8abe24 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -1,15 +1,7 @@
 libxservertest.c
-
-input
-list
 xkb
+input
 xtest
-xi2/protocol-eventconvert
-xi2/protocol-xigetclientpointer
-xi2/protocol-xigetselectedevents
-xi2/protocol-xiquerydevice
-xi2/protocol-xiquerypointer
-xi2/protocol-xiqueryversion
-xi2/protocol-xiselectevents
-xi2/protocol-xisetclientpointer
-xi2/protocol-xiwarppointer
+list
+misc
+fixes
diff --git a/test/xi2/.gitignore b/test/xi2/.gitignore
new file mode 100644
index 000000000..3e9816d37
--- /dev/null
+++ b/test/xi2/.gitignore
@@ -0,0 +1,10 @@
+protocol-eventconvert
+protocol-xigetclientpointer
+protocol-xigetselectedevents
+protocol-xipassivegrabdevice
+protocol-xiquerydevice
+protocol-xiquerypointer
+protocol-xiqueryversion
+protocol-xiselectevents
+protocol-xisetclientpointer
+protocol-xiwarppointer