diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 2a093a0241..67d9aaf6cd 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -293,8 +293,8 @@ elements_voaacenc_LDADD = \
 	-lgstaudio-@GST_API_VERSION@
 
 elements_baseaudiovisualizer_SOURCES = elements/baseaudiovisualizer.c \
-	$(top_srcdir)/gst/audiovisualizers/gstbaseaudiovisualizer.c \
-	$(top_srcdir)/gst/audiovisualizers/gstbaseaudiovisualizer.h
+	$(top_srcdir)/gst/audiovisualizers/gstaudiovisualizer.c \
+	$(top_srcdir)/gst/audiovisualizers/gstaudiovisualizer.h
 elements_baseaudiovisualizer_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) \
 	-I$(top_srcdir)/gst/audiovisualizers $(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS)
diff --git a/tests/check/elements/baseaudiovisualizer.c b/tests/check/elements/baseaudiovisualizer.c
index f1458a28c0..d66bd7d82c 100644
--- a/tests/check/elements/baseaudiovisualizer.c
+++ b/tests/check/elements/baseaudiovisualizer.c
@@ -24,7 +24,7 @@
 #include <gst/gst.h>
 #include <string.h>
 
-#include "gstbaseaudiovisualizer.h"
+#include "gstaudiovisualizer.h"
 
 /* dummy subclass for testing */
 
@@ -36,12 +36,12 @@ typedef struct _GstTestScopeClass GstTestScopeClass;
 
 struct _GstTestScope
 {
-  GstBaseAudioVisualizer parent;
+  GstAudioVisualizer parent;
 };
 
 struct _GstTestScopeClass
 {
-  GstBaseAudioVisualizerClass parent_class;
+  GstAudioVisualizerClass parent_class;
 };
 
 static GstStaticPadTemplate gst_test_scope_src_template =
@@ -64,7 +64,7 @@ GST_STATIC_PAD_TEMPLATE ("sink",
 
 static GType gst_test_scope_get_type (void);
 
-G_DEFINE_TYPE (GstTestScope, gst_test_scope, GST_TYPE_BASE_AUDIO_VISUALIZER);
+G_DEFINE_TYPE (GstTestScope, gst_test_scope, GST_TYPE_AUDIO_VISUALIZER);
 
 static void
 gst_test_scope_class_init (GstTestScopeClass * g_class)