diff --git a/ChangeLog b/ChangeLog
index 12e010e..89ddbbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-24  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* morituri/test/test_common_encode.py:
+	  Use pink-noise as a wave form to make sure it's long enough.
+	  Fixes last tests for F-15.
+
 2011-05-24  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* morituri/common/checksum.py:
diff --git a/morituri/test/test_common_encode.py b/morituri/test/test_common_encode.py
index 3f7e6a8..8e0a512 100644
--- a/morituri/test/test_common_encode.py
+++ b/morituri/test/test_common_encode.py
@@ -94,7 +94,8 @@ class SafeRetagTestCase(tcommon.TestCase):
         self._fd, self._path = tempfile.mkstemp(suffix=u'.morituri.retag.flac')
         
         os.system('gst-launch '
-            'audiotestsrc num-buffers=10 samplesperbuffer=588 ! '
+            'audiotestsrc '
+                'num-buffers=40 samplesperbuffer=588 wave=pink-noise ! '
             'audioconvert ! '
             'audio/x-raw-int,channels=2,width=16,height=16,rate=44100 ! '
             'flacenc ! filesink location=%s > /dev/null 2>&1' % self._path)