diff --git a/ChangeLog b/ChangeLog
index 5663b4a010..edf1f47d14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-07-13  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* Makefile.am:
+	* 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-13  Jan Schmidt  <thaytan@mad.scientist.com>
 
 	* gst/ffmpegcolorspace/gstffmpegcodecmap.c:
diff --git a/Makefile.am b/Makefile.am
index 67105a60aa..8d088843c9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,7 +45,7 @@ include $(top_srcdir)/common/po.mak
 check-valgrind:
 	cd tests/check && make check-valgrind
 
-if HAVE_CHECK
+if HAVE_GST_CHECK
 check-torture:
 	cd tests/check && make torture
 else
diff --git a/configure.ac b/configure.ac
index 1546302d2e..3bf6d8581d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -260,13 +260,7 @@ AG_GST_CHECK_GST_BASE($GST_MAJORMINOR, [$GST_REQ])
 AG_GST_CHECK_GST_GDP($GST_MAJORMINOR, [$GST_REQ])
 AG_GST_CHECK_GST_CONTROLLER($GST_MAJORMINOR, [$GST_REQ])
 AG_GST_CHECK_GST_CHECK($GST_MAJORMINOR, [$GST_REQ], no)
-
-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)
-)
+AM_CONDITIONAL(HAVE_GST_CHECK, test "x$HAVE_GST_CHECK" = "xyes")
 
 dnl Check for documentation xrefs
 GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8155e1a3e9..b5c677c0e1 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,7 +4,7 @@ else
 SUBDIRS_EXAMPLES =
 endif
 
-if HAVE_CHECK
+if HAVE_GST_CHECK
 SUBDIRS_CHECK = check
 else
 SUBDIRS_CHECK =