diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index fe13b678da..b3f6d30e7e 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -316,11 +316,9 @@ elements_voaacenc_LDADD = \
 	$(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD) \
 	-lgstaudio-@GST_API_VERSION@
 
-elements_baseaudiovisualizer_SOURCES = elements/baseaudiovisualizer.c \
-	$(top_srcdir)/gst/audiovisualizers/gstaudiovisualizer.c \
-	$(top_srcdir)/gst/audiovisualizers/gstaudiovisualizer.h
+elements_baseaudiovisualizer_SOURCES = elements/baseaudiovisualizer.c
 elements_baseaudiovisualizer_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) \
-	-I$(top_srcdir)/gst/audiovisualizers $(GST_PLUGINS_BASE_CFLAGS) \
+	$(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS)
 elements_baseaudiovisualizer_LDADD = \
 	$(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@  \
diff --git a/tests/check/elements/baseaudiovisualizer.c b/tests/check/elements/baseaudiovisualizer.c
index 741b48b40e..f0fd93a8b4 100644
--- a/tests/check/elements/baseaudiovisualizer.c
+++ b/tests/check/elements/baseaudiovisualizer.c
@@ -19,13 +19,12 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include "../../gst/audiovisualizers/gstaudiovisualizer.c"
+#undef GST_CAT_DEFAULT
+
 #include <gst/check/gstcheck.h>
-
-#include <gst/gst.h>
 #include <string.h>
 
-#include "gstaudiovisualizer.h"
-
 /* dummy subclass for testing */
 
 #define GST_TYPE_TEST_SCOPE            (gst_test_scope_get_type())