diff --git a/test/test_protocol.py b/test/test_protocol.py
index d6609b4..48f4f5b 100644
--- a/test/test_protocol.py
+++ b/test/test_protocol.py
@@ -165,16 +165,8 @@ class Ei:
         self.send(setup.HandshakeVersion(VERSION_V(1)))
         self.send(setup.ContextType(EiHandshake.EiContextType.SENDER))
         self.send(setup.Name("test client"))
-        self.send(
-            setup.InterfaceVersion(InterfaceName.EI_CONNECTION, VERSION_V(1))
-        )  # this one is required
-        self.send(setup.InterfaceVersion(InterfaceName.EI_CALLBACK, VERSION_V(1)))
-        self.send(setup.InterfaceVersion(InterfaceName.EI_PINGPONG, VERSION_V(1)))
-        self.send(setup.InterfaceVersion(InterfaceName.EI_SEAT, VERSION_V(1)))
-        self.send(setup.InterfaceVersion(InterfaceName.EI_DEVICE, VERSION_V(1)))
-        self.send(setup.InterfaceVersion(InterfaceName.EI_POINTER, VERSION_V(1)))
-        self.send(setup.InterfaceVersion(InterfaceName.EI_KEYBOARD, VERSION_V(1)))
-        self.send(setup.InterfaceVersion(InterfaceName.EI_TOUCHSCREEN, VERSION_V(1)))
+        for iname in filter(lambda i: i != InterfaceName.EI_HANDSHAKE, InterfaceName):
+            self.send(setup.InterfaceVersion(iname, VERSION_V(1)))
         self.send(setup.Finish())
         self.dispatch()
 
@@ -751,18 +743,9 @@ class TestEiProtocol:
         ei.send(setup.ContextType(EiHandshake.EiContextType.SENDER))
         ei.send(setup.Name("test client"))
 
-        for interface in [
-            InterfaceName.EI_CONNECTION,
-            InterfaceName.EI_CALLBACK,
-            InterfaceName.EI_PINGPONG,
-            InterfaceName.EI_SEAT,
-            InterfaceName.EI_DEVICE,
-            InterfaceName.EI_POINTER,
-            InterfaceName.EI_KEYBOARD,
-            InterfaceName.EI_TOUCHSCREEN,
-        ]:
-            if interface != missing_interface:
-                ei.send(setup.InterfaceVersion(interface, 1))
+        for iname in filter(lambda i: i != InterfaceName.EI_HANDSHAKE, InterfaceName):
+            if iname != missing_interface:
+                ei.send(setup.InterfaceVersion(iname, VERSION_V(1)))
 
         @attr.s
         class Status: