diff --git a/tests/old/testsuite/embed/Makefile.am b/tests/old/testsuite/embed/Makefile.am
new file mode 100644
index 0000000000..94910254aa
--- /dev/null
+++ b/tests/old/testsuite/embed/Makefile.am
@@ -0,0 +1,8 @@
+
+TESTS = embed
+
+check_PROGRAMS = embed
+
+# we have nothing but apps here, we can do this safely
+LIBS = $(GST_LIBS) $(GTK_LIBS)
+AM_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS)
diff --git a/tests/old/testsuite/embed/embed.c b/tests/old/testsuite/embed/embed.c
new file mode 100644
index 0000000000..5fd88a9488
--- /dev/null
+++ b/tests/old/testsuite/embed/embed.c
@@ -0,0 +1,101 @@
+#include <gst/gst.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+#include <gdk/gdkkeysyms.h>
+
+GtkWidget *window;
+GstElement *testsrc;
+GstElement *xvideosink;
+GstElement *filter;
+GdkWindow *wind;
+GstElement *pipeline;
+
+static int
+configure(GtkWidget * widget, GdkEventConfigure * evt, gpointer data)
+{
+	printf("configure\n");
+	if (wind){
+		gdk_window_resize(wind, evt->width, evt->height);
+		gdk_window_reparent(wind, window->window, 0, 0);
+	}
+
+	return FALSE;
+}
+
+static int
+map_event(GtkWidget * widget, GdkEventConfigure * evt, gpointer data)
+{
+	printf("map\n");
+	return FALSE;
+}
+
+int xid;
+
+static int have_xid(GstElement * xv, gpointer data)
+{
+	GValue value = { 0 };
+//	int xid;
+
+	printf("have_xid\n");
+	g_value_init(&value, G_TYPE_INT);
+	g_object_get_property(G_OBJECT(xvideosink), "xid", &value);
+	xid = g_value_get_int(&value);
+
+	wind = gdk_window_foreign_new(xid);
+printf("gdk_window_reparent() wind=%p window=%p xid=%d\n",wind,window->window,xid);
+	gdk_window_reparent(wind, window->window, 0, 0);
+	gdk_window_show(wind);
+
+	return FALSE;
+}
+
+int main(int argc, char *argv[])
+{
+	//GValue value = { 0 };
+
+	gtk_init(&argc, &argv);
+	gst_init(&argc, &argv);
+
+	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+	gtk_window_set_default_size(GTK_WINDOW(window), 640, 480);
+
+	gtk_signal_connect(GTK_OBJECT(window), "configure_event",
+			   GTK_SIGNAL_FUNC(configure), NULL);
+	gtk_signal_connect(GTK_OBJECT(window), "map",
+			   GTK_SIGNAL_FUNC(map_event), NULL);
+
+	gtk_widget_show_all(window);
+
+	pipeline = gst_element_factory_make("pipeline", NULL);
+
+	testsrc = gst_element_factory_make("videotestsrc", NULL);
+#if 0
+	g_value_init(&value, G_TYPE_INT);
+	g_value_set_int(&value, 640);
+	g_object_set_property(G_OBJECT(testsrc), "width", &value);
+	g_value_set_int(&value, 480);
+	g_object_set_property(G_OBJECT(testsrc), "height", &value);
+#endif
+
+	xvideosink = gst_element_factory_make("xvideosink", NULL);
+	g_signal_connect(xvideosink, "have_xid", (GCallback) (have_xid),
+			 NULL);
+
+	gst_bin_add(GST_BIN(pipeline), testsrc);
+	gst_bin_add(GST_BIN(pipeline), xvideosink);
+
+	gst_element_connect(testsrc, xvideosink);
+
+	if (pipeline == NULL) {
+		g_warning("Could not generate usable pipeline\n");
+		return 1;
+	}
+
+	g_idle_add((GSourceFunc) gst_bin_iterate, pipeline);
+
+	gst_element_set_state(pipeline, GST_STATE_PLAYING);
+
+	gtk_main();
+
+	return 0;
+}
diff --git a/testsuite/embed/Makefile.am b/testsuite/embed/Makefile.am
new file mode 100644
index 0000000000..94910254aa
--- /dev/null
+++ b/testsuite/embed/Makefile.am
@@ -0,0 +1,8 @@
+
+TESTS = embed
+
+check_PROGRAMS = embed
+
+# we have nothing but apps here, we can do this safely
+LIBS = $(GST_LIBS) $(GTK_LIBS)
+AM_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS)
diff --git a/testsuite/embed/embed.c b/testsuite/embed/embed.c
new file mode 100644
index 0000000000..5fd88a9488
--- /dev/null
+++ b/testsuite/embed/embed.c
@@ -0,0 +1,101 @@
+#include <gst/gst.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+#include <gdk/gdkkeysyms.h>
+
+GtkWidget *window;
+GstElement *testsrc;
+GstElement *xvideosink;
+GstElement *filter;
+GdkWindow *wind;
+GstElement *pipeline;
+
+static int
+configure(GtkWidget * widget, GdkEventConfigure * evt, gpointer data)
+{
+	printf("configure\n");
+	if (wind){
+		gdk_window_resize(wind, evt->width, evt->height);
+		gdk_window_reparent(wind, window->window, 0, 0);
+	}
+
+	return FALSE;
+}
+
+static int
+map_event(GtkWidget * widget, GdkEventConfigure * evt, gpointer data)
+{
+	printf("map\n");
+	return FALSE;
+}
+
+int xid;
+
+static int have_xid(GstElement * xv, gpointer data)
+{
+	GValue value = { 0 };
+//	int xid;
+
+	printf("have_xid\n");
+	g_value_init(&value, G_TYPE_INT);
+	g_object_get_property(G_OBJECT(xvideosink), "xid", &value);
+	xid = g_value_get_int(&value);
+
+	wind = gdk_window_foreign_new(xid);
+printf("gdk_window_reparent() wind=%p window=%p xid=%d\n",wind,window->window,xid);
+	gdk_window_reparent(wind, window->window, 0, 0);
+	gdk_window_show(wind);
+
+	return FALSE;
+}
+
+int main(int argc, char *argv[])
+{
+	//GValue value = { 0 };
+
+	gtk_init(&argc, &argv);
+	gst_init(&argc, &argv);
+
+	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+	gtk_window_set_default_size(GTK_WINDOW(window), 640, 480);
+
+	gtk_signal_connect(GTK_OBJECT(window), "configure_event",
+			   GTK_SIGNAL_FUNC(configure), NULL);
+	gtk_signal_connect(GTK_OBJECT(window), "map",
+			   GTK_SIGNAL_FUNC(map_event), NULL);
+
+	gtk_widget_show_all(window);
+
+	pipeline = gst_element_factory_make("pipeline", NULL);
+
+	testsrc = gst_element_factory_make("videotestsrc", NULL);
+#if 0
+	g_value_init(&value, G_TYPE_INT);
+	g_value_set_int(&value, 640);
+	g_object_set_property(G_OBJECT(testsrc), "width", &value);
+	g_value_set_int(&value, 480);
+	g_object_set_property(G_OBJECT(testsrc), "height", &value);
+#endif
+
+	xvideosink = gst_element_factory_make("xvideosink", NULL);
+	g_signal_connect(xvideosink, "have_xid", (GCallback) (have_xid),
+			 NULL);
+
+	gst_bin_add(GST_BIN(pipeline), testsrc);
+	gst_bin_add(GST_BIN(pipeline), xvideosink);
+
+	gst_element_connect(testsrc, xvideosink);
+
+	if (pipeline == NULL) {
+		g_warning("Could not generate usable pipeline\n");
+		return 1;
+	}
+
+	g_idle_add((GSourceFunc) gst_bin_iterate, pipeline);
+
+	gst_element_set_state(pipeline, GST_STATE_PLAYING);
+
+	gtk_main();
+
+	return 0;
+}