diff --git a/ChangeLog b/ChangeLog
index 0308929438..7ae74a75e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-07-13  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* configure.ac:
+	* tests/Makefile.am:
+	Remove bogus check for libcheck, since we check for
+	gstreamer-check and it pulls in the required info from there, and we
+	weren't actually _using_ the information for libcheck ourselves
+	anyway.
+
 2007-07-12  Stefan Kost  <ensonic@users.sf.net>
 
 	* configure.ac:
diff --git a/configure.ac b/configure.ac
index 892634dfe2..becd801585 100644
--- a/configure.ac
+++ b/configure.ac
@@ -187,16 +187,12 @@ AG_GST_CHECK_GST_GDP($GST_MAJORMINOR, [$GST_REQ])
 AG_GST_CHECK_GST_CHECK($GST_MAJORMINOR, [$GST_REQ], no)
 AG_GST_CHECK_GST_CONTROLLER($GST_MAJORMINOR, [$GST_REQ])
 AG_GST_CHECK_GST_PLUGINS_BASE($GST_MAJORMINOR, [$GSTPB_REQ], no)
+AM_CONDITIONAL(HAVE_GST_CHECK, test "x$HAVE_GST_CHECK" = "xyes")
+
 GSTPB_PLUGINS_DIR=`$PKG_CONFIG gstreamer-plugins-base-$GST_MAJORMINOR --variable pluginsdir`
 AC_SUBST(GSTPB_PLUGINS_DIR)
 AC_MSG_NOTICE(Using GStreamer Base Plugins in $GSTPB_PLUGINS_DIR)
 
-dnl FIXME: get rid of this by making sure gstreamer-check brings it in
-dnl check for "check", unit testing library/header
-PKG_CHECK_MODULES(CHECK, check >= 0.9.2,
-  AM_CONDITIONAL(HAVE_CHECK, true),
-  AM_CONDITIONAL(HAVE_CHECK, false)
-)
 dnl Check for documentation xrefs
 GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
 GST_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-$GST_MAJORMINOR`"
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6ba48806a9..fb07e8e95b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-if HAVE_CHECK
+if HAVE_GST_CHECK
 SUBDIRS_CHECK = check
 else
 SUBDIRS_CHECK =