diff --git a/ChangeLog b/ChangeLog
index 38d01b8be6..a0751a9273 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-07-02  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* configure.ac:
+	  don't set CFLAGS and friends for gcov, done from GST_GCOV now
+	* tests/check/Makefile.am:
+	  clean up gcov files
+
 2006-07-02  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* gst/gstcaps.c: (gst_caps_remove_and_get_structure):
diff --git a/configure.ac b/configure.ac
index e7dc018589..b3e61537e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -436,20 +436,6 @@ if test "x$USE_DEBUG" = xyes; then
 fi
 AC_SUBST(PROFILE_CFLAGS)
 
-dnl if gcov is used, we do not want default -O2 CFLAGS
-if test "x$GST_GCOV_ENABLED" = "xyes"
-then
-  CFLAGS="-O0"
-  AC_SUBST(CFLAGS)
-  CXXFLAGS="-O0"
-  AC_SUBST(CXXFLAGS)
-  FFLAGS="-O0"
-  AC_SUBST(FFLAGS)
-  CCASFLAGS="-O0"
-  AC_SUBST(CCASFLAGS)
-  AC_MSG_NOTICE([gcov enabled, setting CFLAGS and friends to $CFLAGS])
-fi
-
 DEPRECATED_CFLAGS="-DGST_DISABLE_DEPRECATED"
 AC_SUBST(DEPRECATED_CFLAGS)
 
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 872bf12e70..a14432afb3 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -18,7 +18,7 @@ plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
 install-pluginLTLIBRARIES:
 
 # the core dumps of some machines have PIDs appended
-CLEANFILES = core.* test-registry.xml
+CLEANFILES = core.* test-registry.xml *.gcno *.gcda
 
 SUPPRESSIONS = $(top_srcdir)/common/gst.supp