diff --git a/ChangeLog b/ChangeLog
index d076b1df08..1b77a5c064 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-02  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* testsuite/caps/intersection.c: (main):
+	* testsuite/caps/union.c: (main):
+	  more gcc4 fixes by casting
+
 2005-05-02  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* gst/gstregistry.h:
diff --git a/tests/old/testsuite/caps/intersection.c b/tests/old/testsuite/caps/intersection.c
index 48d320a045..bda8950ce7 100644
--- a/tests/old/testsuite/caps/intersection.c
+++ b/tests/old/testsuite/caps/intersection.c
@@ -52,8 +52,9 @@ main (int argc, char *argv[])
 
   gst_init (&argc, &argv);
 
-  doc = xmlNewDoc ("1.0");
-  doc->xmlRootNode = xmlNewDocNode (doc, NULL, "Capabilities", NULL);
+  doc = xmlNewDoc ((const xmlChar *) "1.0");
+  doc->xmlRootNode =
+      xmlNewDocNode (doc, NULL, (const xmlChar *) "Capabilities", NULL);
 
   /*
      g_mem_chunk_info ();
@@ -66,28 +67,38 @@ main (int argc, char *argv[])
 
   caps = gst_caps_intersect (gst_static_caps_get (&sinkcaps),
       gst_static_caps_get (&mp1parsecaps));
-  parent = xmlNewChild (doc->xmlRootNode, NULL, "Capabilities1", NULL);
+  parent =
+      xmlNewChild (doc->xmlRootNode, NULL, (const xmlChar *) "Capabilities1",
+      NULL);
   gst_caps_save_thyself (caps, parent);
 
   caps = gst_caps_intersect (gst_static_caps_get (&rawcaps),
       gst_static_caps_get (&rawcaps2));
-  parent = xmlNewChild (doc->xmlRootNode, NULL, "Capabilities2", NULL);
+  parent =
+      xmlNewChild (doc->xmlRootNode, NULL, (const xmlChar *) "Capabilities2",
+      NULL);
   gst_caps_save_thyself (caps, parent);
 
   caps = gst_caps_intersect (gst_static_caps_get (&rawcaps3),
       gst_static_caps_get (&rawcaps4));
-  parent = xmlNewChild (doc->xmlRootNode, NULL, "Capabilities3", NULL);
+  parent =
+      xmlNewChild (doc->xmlRootNode, NULL, (const xmlChar *) "Capabilities3",
+      NULL);
   gst_caps_save_thyself (caps, parent);
 
   caps = gst_caps_intersect (gst_static_caps_get (&rawcaps3),
       gst_static_caps_get (&rawcaps5));
-  parent = xmlNewChild (doc->xmlRootNode, NULL, "Capabilities4", NULL);
+  parent =
+      xmlNewChild (doc->xmlRootNode, NULL, (const xmlChar *) "Capabilities4",
+      NULL);
   gst_caps_save_thyself (caps, parent);
 
   caps = gst_caps_intersect (gst_static_caps_get (&rawcaps6),
       gst_caps_new_full (gst_structure_copy (gst_caps_get_structure
               (gst_static_caps_get (&rawcaps6), 0)), NULL));
-  parent = xmlNewChild (doc->xmlRootNode, NULL, "Capabilities5", NULL);
+  parent =
+      xmlNewChild (doc->xmlRootNode, NULL, (const xmlChar *) "Capabilities5",
+      NULL);
   gst_caps_save_thyself (caps, parent);
 
   caps = gst_caps_intersect (gst_static_caps_get (&rawcaps7),
diff --git a/tests/old/testsuite/caps/union.c b/tests/old/testsuite/caps/union.c
index b229bd75a8..798f6faa2a 100644
--- a/tests/old/testsuite/caps/union.c
+++ b/tests/old/testsuite/caps/union.c
@@ -17,12 +17,15 @@ main (int argc, char *argv[])
 
   gst_init (&argc, &argv);
 
-  doc = xmlNewDoc ("1.0");
-  doc->xmlRootNode = xmlNewDocNode (doc, NULL, "Capabilities", NULL);
+  doc = xmlNewDoc ((const xmlChar *) "1.0");
+  doc->xmlRootNode =
+      xmlNewDocNode (doc, NULL, (const xmlChar *) "Capabilities", NULL);
 
   caps = gst_caps_union (gst_static_caps_get (&sinkcaps),
       gst_static_caps_get (&mp1parsecaps));
-  parent = xmlNewChild (doc->xmlRootNode, NULL, "Capabilities1", NULL);
+  parent =
+      xmlNewChild (doc->xmlRootNode, NULL, (const xmlChar *) "Capabilities1",
+      NULL);
   gst_caps_save_thyself (caps, parent);
 
   xmlDocDump (stdout, doc);
diff --git a/testsuite/caps/intersection.c b/testsuite/caps/intersection.c
index 48d320a045..bda8950ce7 100644
--- a/testsuite/caps/intersection.c
+++ b/testsuite/caps/intersection.c
@@ -52,8 +52,9 @@ main (int argc, char *argv[])
 
   gst_init (&argc, &argv);
 
-  doc = xmlNewDoc ("1.0");
-  doc->xmlRootNode = xmlNewDocNode (doc, NULL, "Capabilities", NULL);
+  doc = xmlNewDoc ((const xmlChar *) "1.0");
+  doc->xmlRootNode =
+      xmlNewDocNode (doc, NULL, (const xmlChar *) "Capabilities", NULL);
 
   /*
      g_mem_chunk_info ();
@@ -66,28 +67,38 @@ main (int argc, char *argv[])
 
   caps = gst_caps_intersect (gst_static_caps_get (&sinkcaps),
       gst_static_caps_get (&mp1parsecaps));
-  parent = xmlNewChild (doc->xmlRootNode, NULL, "Capabilities1", NULL);
+  parent =
+      xmlNewChild (doc->xmlRootNode, NULL, (const xmlChar *) "Capabilities1",
+      NULL);
   gst_caps_save_thyself (caps, parent);
 
   caps = gst_caps_intersect (gst_static_caps_get (&rawcaps),
       gst_static_caps_get (&rawcaps2));
-  parent = xmlNewChild (doc->xmlRootNode, NULL, "Capabilities2", NULL);
+  parent =
+      xmlNewChild (doc->xmlRootNode, NULL, (const xmlChar *) "Capabilities2",
+      NULL);
   gst_caps_save_thyself (caps, parent);
 
   caps = gst_caps_intersect (gst_static_caps_get (&rawcaps3),
       gst_static_caps_get (&rawcaps4));
-  parent = xmlNewChild (doc->xmlRootNode, NULL, "Capabilities3", NULL);
+  parent =
+      xmlNewChild (doc->xmlRootNode, NULL, (const xmlChar *) "Capabilities3",
+      NULL);
   gst_caps_save_thyself (caps, parent);
 
   caps = gst_caps_intersect (gst_static_caps_get (&rawcaps3),
       gst_static_caps_get (&rawcaps5));
-  parent = xmlNewChild (doc->xmlRootNode, NULL, "Capabilities4", NULL);
+  parent =
+      xmlNewChild (doc->xmlRootNode, NULL, (const xmlChar *) "Capabilities4",
+      NULL);
   gst_caps_save_thyself (caps, parent);
 
   caps = gst_caps_intersect (gst_static_caps_get (&rawcaps6),
       gst_caps_new_full (gst_structure_copy (gst_caps_get_structure
               (gst_static_caps_get (&rawcaps6), 0)), NULL));
-  parent = xmlNewChild (doc->xmlRootNode, NULL, "Capabilities5", NULL);
+  parent =
+      xmlNewChild (doc->xmlRootNode, NULL, (const xmlChar *) "Capabilities5",
+      NULL);
   gst_caps_save_thyself (caps, parent);
 
   caps = gst_caps_intersect (gst_static_caps_get (&rawcaps7),
diff --git a/testsuite/caps/union.c b/testsuite/caps/union.c
index b229bd75a8..798f6faa2a 100644
--- a/testsuite/caps/union.c
+++ b/testsuite/caps/union.c
@@ -17,12 +17,15 @@ main (int argc, char *argv[])
 
   gst_init (&argc, &argv);
 
-  doc = xmlNewDoc ("1.0");
-  doc->xmlRootNode = xmlNewDocNode (doc, NULL, "Capabilities", NULL);
+  doc = xmlNewDoc ((const xmlChar *) "1.0");
+  doc->xmlRootNode =
+      xmlNewDocNode (doc, NULL, (const xmlChar *) "Capabilities", NULL);
 
   caps = gst_caps_union (gst_static_caps_get (&sinkcaps),
       gst_static_caps_get (&mp1parsecaps));
-  parent = xmlNewChild (doc->xmlRootNode, NULL, "Capabilities1", NULL);
+  parent =
+      xmlNewChild (doc->xmlRootNode, NULL, (const xmlChar *) "Capabilities1",
+      NULL);
   gst_caps_save_thyself (caps, parent);
 
   xmlDocDump (stdout, doc);