diff --git a/ChangeLog b/ChangeLog
index 1a16177863..459bafbfdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-02  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* testsuite/indexers/cache1.c: (lookup):
+	* testsuite/indexers/indexdump.c: (main):
+	  more print format fixes
+
 2005-05-02  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* testsuite/elements/property.h:
diff --git a/tests/old/testsuite/indexers/cache1.c b/tests/old/testsuite/indexers/cache1.c
index e61d9d5db6..2cfff7b40c 100644
--- a/tests/old/testsuite/indexers/cache1.c
+++ b/tests/old/testsuite/indexers/cache1.c
@@ -33,9 +33,10 @@ lookup (GstIndex * index, GstIndexLookupMethod method,
     gst_index_entry_assoc_map (entry, dest_format, &result);
 
     if (result == expecting) {
-      g_print ("OK (%lld)\n", result);
+      g_print ("OK (%" G_GINT64_FORMAT ")\n", result);
     } else {
-      g_print ("FAIL - expecting %lld, got %lld\n", expecting, result);
+      g_print ("FAIL - expecting %" G_GINT64_FORMAT ", got %" G_GINT64_FORMAT
+          "\n", expecting, result);
     }
   } else {
     const GstFormatDefinition *def = gst_format_get_details (src_format);
@@ -43,8 +44,9 @@ lookup (GstIndex * index, GstIndexLookupMethod method,
     if (expecting == -1)
       g_print ("OK (not found)\n");
     else
-      g_print ("FAIL - no index entry found for %lld %s, expecting %lld\n",
-          src_value, def->nick, expecting);
+      g_print ("FAIL - no index entry found for %" G_GINT64_FORMAT
+          " %s, expecting %" G_GINT64_FORMAT "\n", src_value, def->nick,
+          expecting);
   }
 }
 
diff --git a/tests/old/testsuite/indexers/indexdump.c b/tests/old/testsuite/indexers/indexdump.c
index ba846b2d6a..a8c48969b5 100644
--- a/tests/old/testsuite/indexers/indexdump.c
+++ b/tests/old/testsuite/indexers/indexdump.c
@@ -71,7 +71,8 @@ main (gint argc, gchar * argv[])
         g_print (" time %.4f",
             GST_INDEX_ASSOC_VALUE (entry, fx) / (double) GST_SECOND);
       } else
-        g_print (" %s %lld", def->nick, GST_INDEX_ASSOC_VALUE (entry, fx));
+        g_print (" %s %" G_GINT64_FORMAT, def->nick,
+            GST_INDEX_ASSOC_VALUE (entry, fx));
     }
     g_print ("\n");
   }
diff --git a/testsuite/indexers/cache1.c b/testsuite/indexers/cache1.c
index e61d9d5db6..2cfff7b40c 100644
--- a/testsuite/indexers/cache1.c
+++ b/testsuite/indexers/cache1.c
@@ -33,9 +33,10 @@ lookup (GstIndex * index, GstIndexLookupMethod method,
     gst_index_entry_assoc_map (entry, dest_format, &result);
 
     if (result == expecting) {
-      g_print ("OK (%lld)\n", result);
+      g_print ("OK (%" G_GINT64_FORMAT ")\n", result);
     } else {
-      g_print ("FAIL - expecting %lld, got %lld\n", expecting, result);
+      g_print ("FAIL - expecting %" G_GINT64_FORMAT ", got %" G_GINT64_FORMAT
+          "\n", expecting, result);
     }
   } else {
     const GstFormatDefinition *def = gst_format_get_details (src_format);
@@ -43,8 +44,9 @@ lookup (GstIndex * index, GstIndexLookupMethod method,
     if (expecting == -1)
       g_print ("OK (not found)\n");
     else
-      g_print ("FAIL - no index entry found for %lld %s, expecting %lld\n",
-          src_value, def->nick, expecting);
+      g_print ("FAIL - no index entry found for %" G_GINT64_FORMAT
+          " %s, expecting %" G_GINT64_FORMAT "\n", src_value, def->nick,
+          expecting);
   }
 }
 
diff --git a/testsuite/indexers/indexdump.c b/testsuite/indexers/indexdump.c
index ba846b2d6a..a8c48969b5 100644
--- a/testsuite/indexers/indexdump.c
+++ b/testsuite/indexers/indexdump.c
@@ -71,7 +71,8 @@ main (gint argc, gchar * argv[])
         g_print (" time %.4f",
             GST_INDEX_ASSOC_VALUE (entry, fx) / (double) GST_SECOND);
       } else
-        g_print (" %s %lld", def->nick, GST_INDEX_ASSOC_VALUE (entry, fx));
+        g_print (" %s %" G_GINT64_FORMAT, def->nick,
+            GST_INDEX_ASSOC_VALUE (entry, fx));
     }
     g_print ("\n");
   }