diff --git a/test/eierpecken.h b/test/eierpecken.h
index 6ff9166..93ac1f7 100644
--- a/test/eierpecken.h
+++ b/test/eierpecken.h
@@ -136,3 +136,8 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(struct eis_event *, eis_event_unref);
 #define _cleanup_eis_event_ _cleanup_(eis_event_unrefp)
 DEFINE_TRIVIAL_CLEANUP_FUNC(struct eis_device *, eis_device_unref);
 #define _cleanup_eis_device_ _cleanup_(eis_device_unrefp)
+
+/* Macros intended just for readability to make it more obvious which part
+   of a test handles server vs client */
+#define with_server(peck_) for (struct eis *eis = peck_get_eis(peck_); eis; eis = NULL)
+#define with_client(peck_) for (struct ei *ei = peck_get_ei(peck_); ei; ei = NULL)
diff --git a/test/test-ei.c b/test/test-ei.c
index 2b7ae10..5468fdc 100644
--- a/test/test-ei.c
+++ b/test/test-ei.c
@@ -8,11 +8,6 @@
 #include "libei.h"
 #include "eierpecken.h"
 
-/* Macros intended just for readability to make it more obvious which part
-   of a test handles server vs client */
-#define with_server(peck_) for (struct eis *eis = peck_get_eis(peck_); eis; eis = NULL)
-#define with_client(peck_) for (struct ei *ei = peck_get_ei(peck_); ei; ei = NULL)
-
 static MunitResult
 test_ei_ref_unref(const MunitParameter params[], void *user_data)
 {