diff --git a/src/tests/clutter/conform/meson.build b/src/tests/clutter/conform/meson.build
index 19fcf1c34..4484380ee 100644
--- a/src/tests/clutter/conform/meson.build
+++ b/src/tests/clutter/conform/meson.build
@@ -36,6 +36,7 @@ clutter_conform_tests_general_tests = [
   'timeline',
   'timeline-interpolate',
   'timeline-progress',
+  'timeline-rewind',
   'units',
 ]
 
diff --git a/src/tests/clutter/conform/timeline-rewind.c b/src/tests/clutter/conform/timeline-rewind.c
index 0263649ac..ca3d1096e 100644
--- a/src/tests/clutter/conform/timeline-rewind.c
+++ b/src/tests/clutter/conform/timeline-rewind.c
@@ -1,8 +1,9 @@
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #include <stdlib.h>
 #include <glib.h>
 #include <clutter/clutter.h>
 
-#include "test-conform-common.h"
+#include "tests/clutter-test-utils.h"
 
 #define TEST_TIMELINE_DURATION 500
 #define TEST_WATCHDOG_KICK_IN_SECONDS 10
@@ -66,7 +67,7 @@ new_frame_cb (ClutterTimeline *timeline,
     }
 }
 
-void
+static void
 timeline_rewind (void)
 {
   TestState state;
@@ -90,3 +91,7 @@ timeline_rewind (void)
 
   g_object_unref (state.timeline);
 }
+
+CLUTTER_TEST_SUITE (
+  CLUTTER_TEST_UNIT ("/timeline/rewind", timeline_rewind)
+)