diff --git a/test/litest.c b/test/litest.c
index f34ab502..16738f8c 100644
--- a/test/litest.c
+++ b/test/litest.c
@@ -4765,123 +4765,9 @@ litest_assert_touch_cancel(struct libinput *li)
 }
 
 void
-litest_timeout_tap(void)
+litest_timeout(int millis)
 {
-	msleep(300);
-}
-
-void
-litest_timeout_tapndrag(void)
-{
-	msleep(520);
-}
-
-void
-litest_timeout_debounce(void)
-{
-	msleep(30);
-}
-
-void
-litest_timeout_softbuttons(void)
-{
-	msleep(300);
-}
-
-void
-litest_timeout_buttonscroll(void)
-{
-	msleep(300);
-}
-
-void
-litest_timeout_finger_switch(void)
-{
-	msleep(140);
-}
-
-void
-litest_timeout_wheel_scroll(void)
-{
-	msleep(600);
-}
-
-void
-litest_timeout_edgescroll(void)
-{
-	msleep(300);
-}
-
-void
-litest_timeout_middlebutton(void)
-{
-	msleep(70);
-}
-
-void
-litest_timeout_dwt_short(void)
-{
-	msleep(220);
-}
-
-void
-litest_timeout_dwt_long(void)
-{
-	msleep(520);
-}
-
-void
-litest_timeout_gesture(void)
-{
-	msleep(120);
-}
-
-void
-litest_timeout_gesture_scroll(void)
-{
-	msleep(180);
-}
-
-void
-litest_timeout_gesture_hold(void)
-{
-	msleep(300);
-}
-
-void
-litest_timeout_gesture_quick_hold(void)
-{
-	msleep(60);
-}
-
-void
-litest_timeout_trackpoint(void)
-{
-	msleep(320);
-}
-
-void
-litest_timeout_tablet_proxout(void)
-{
-	msleep(170);
-}
-
-void
-litest_timeout_touch_arbitration(void)
-{
-	msleep(100);
-}
-
-void
-litest_timeout_hysteresis(void)
-{
-	msleep(90);
-}
-
-void
-litest_timeout_3fg_drag(void)
-{
-	msleep(800);
+	msleep(millis);
 }
 
 void
diff --git a/test/litest.h b/test/litest.h
index a2cd7155..ab7863a0 100644
--- a/test/litest.h
+++ b/test/litest.h
@@ -1256,64 +1256,28 @@ litest_create_uinput_abs_device(const char *name,
 				...);
 
 void
-litest_timeout_tap(void);
+litest_timeout(int millis);
 
-void
-litest_timeout_tapndrag(void);
-
-void
-litest_timeout_debounce(void);
-
-void
-litest_timeout_softbuttons(void);
-
-void
-litest_timeout_buttonscroll(void);
-
-void
-litest_timeout_wheel_scroll(void);
-
-void
-litest_timeout_edgescroll(void);
-
-void
-litest_timeout_finger_switch(void);
-
-void
-litest_timeout_middlebutton(void);
-
-void
-litest_timeout_dwt_short(void);
-
-void
-litest_timeout_dwt_long(void);
-
-void
-litest_timeout_gesture(void);
-
-void
-litest_timeout_gesture_scroll(void);
-
-void
-litest_timeout_gesture_hold(void);
-
-void
-litest_timeout_gesture_quick_hold(void);
-
-void
-litest_timeout_trackpoint(void);
-
-void
-litest_timeout_tablet_proxout(void);
-
-void
-litest_timeout_touch_arbitration(void);
-
-void
-litest_timeout_hysteresis(void);
-
-void
-litest_timeout_3fg_drag(void);
+#define litest_timeout_tap() litest_timeout(300)
+#define litest_timeout_tapndrag() litest_timeout(520)
+#define litest_timeout_debounce() litest_timeout(30)
+#define litest_timeout_softbuttons() litest_timeout(300)
+#define litest_timeout_buttonscroll() litest_timeout(300)
+#define litest_timeout_wheel_scroll() litest_timeout(600)
+#define litest_timeout_edgescroll() litest_timeout(300)
+#define litest_timeout_finger_switch() litest_timeout(140)
+#define litest_timeout_middlebutton() litest_timeout(70)
+#define litest_timeout_dwt_short() litest_timeout(220)
+#define litest_timeout_dwt_long() litest_timeout(520)
+#define litest_timeout_gesture() litest_timeout(120)
+#define litest_timeout_gesture_scroll() litest_timeout(180)
+#define litest_timeout_gesture_hold() litest_timeout(300)
+#define litest_timeout_gesture_quick_hold() litest_timeout(60)
+#define litest_timeout_trackpoint() litest_timeout(320)
+#define litest_timeout_tablet_proxout() litest_timeout(170)
+#define litest_timeout_touch_arbitration() litest_timeout(100)
+#define litest_timeout_hysteresis() litest_timeout(90)
+#define litest_timeout_3fg_drag() litest_timeout(800)
 
 void
 litest_push_event_frame(struct litest_device *dev);