diff --git a/ChangeLog b/ChangeLog
index 3303f0ba4b..379eb05b5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-11  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* tests/icles/Makefile.am:
+	  don't build the tests if we don't have the libs
+
 2006-01-10  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* ext/cdparanoia/gstcdparanoiasrc.c: (gst_cd_paranoia_src_close),
diff --git a/tests/icles/Makefile.am b/tests/icles/Makefile.am
index 43661141f1..a12662413e 100644
--- a/tests/icles/Makefile.am
+++ b/tests/icles/Makefile.am
@@ -1,7 +1,14 @@
-noinst_PROGRAMS = stress-xoverlay
+if USE_X
+X_TESTS = stress-xoverlay
 
 stress_xoverlay_SOURCES = stress-xoverlay.c
 stress_xoverlay_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS)
 stress_xoverlay_LDFLAGS = $(GST_LIBS) $(X_LIBS)
 stress_xoverlay_LDADD = \
 	$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la
+else
+X_TESTS =
+endif
+
+noinst_PROGRAMS = $(X_TESTS)
+