diff --git a/ChangeLog b/ChangeLog
index 1581dfe914..1e8ae179a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-06  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* tests/check/generic/libavcodec-locking.c: (GST_START_TEST):
+	Fix the filter caps string for the test. Limit it to 10 fps, which
+	means encoding ~ 50 frames before timeout
+
 2006-12-04  Jan Schmidt  <thaytan@mad.scientist.com>
 
 	* HACKING:
diff --git a/tests/check/generic/libavcodec-locking.c b/tests/check/generic/libavcodec-locking.c
index 02b3dde490..88d321a80f 100644
--- a/tests/check/generic/libavcodec-locking.c
+++ b/tests/check/generic/libavcodec-locking.c
@@ -100,13 +100,13 @@ GST_START_TEST (test_libavcodec_locks)
   gint i;
 
   for (i=0; i<NUM_SINKS; i++)
-    sink[i] = g_strdup_printf (" t.src%d ! queue ! ffenc_mpeg4 ! ffdec_mpeg4 ! fakesink", i);
+    sink[i] = g_strdup_printf (" t.src%d ! queue ! ffenc_mpeg4 ! ffdec_mpeg4 ! fakesink sync=true", i);
   
   sink [NUM_SINKS] = NULL;
   
   sinks = g_strjoinv (" ", sink);
   
-  s = g_strdup_printf ("videotestsrc ! video/x-raw-yuv,format:fourcc=I420,width=320,height=240 ! tee name=t %s", sinks);
+  s = g_strdup_printf ("videotestsrc ! video/x-raw-yuv,format=(fourcc)I420,width=320,height=240,framerate=(fraction)10/1 ! tee name=t %s", sinks);
   
   run_pipeline (setup_pipeline (s), s,
       GST_MESSAGE_ANY & ~(GST_MESSAGE_ERROR | GST_MESSAGE_WARNING),