diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0bc4f73095..2e7f191bb4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,6 +2,7 @@ noinst_PROGRAMS = \
 	simple-decoder			\
 	test-decode			\
 	test-display			\
+	test-filter			\
 	test-surfaces			\
 	test-windows			\
 	test-subpicture			\
@@ -85,6 +86,11 @@ test_display_SOURCES	= test-display.c
 test_display_CFLAGS	= $(TEST_CFLAGS)
 test_display_LDADD	= libutils.la $(TEST_LIBS)
 
+test_filter_SOURCES	= test-filter.c
+test_filter_CFLAGS	= $(TEST_CFLAGS) $(GST_VIDEO_CFLAGS)
+test_filter_LDADD	= libutils.la $(TEST_LIBS) $(GST_VIDEO_LIBS) \
+	$(top_builddir)/gst-libs/gst/video/libgstvaapi-videoutils.la
+
 test_surfaces_SOURCES	= test-surfaces.c
 test_surfaces_CFLAGS	= $(TEST_CFLAGS) $(GST_VIDEO_CFLAGS)
 test_surfaces_LDADD	= libutils.la $(TEST_LIBS) $(GST_VIDEO_LIBS) \
diff --git a/tests/test-filter.c b/tests/test-filter.c
new file mode 100755
index 0000000000..c04e12e78a
--- /dev/null
+++ b/tests/test-filter.c
@@ -0,0 +1,185 @@
+/*
+ *  test-filter.c - Test GstVaapiFilter
+ *
+ *  Copyright (C) 2010-2011 Splitted-Desktop Systems
+ *  Copyright (C) 2012-2013 Intel Corporation
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
+ */
+
+#include "gst/vaapi/sysdeps.h"
+#include <gst/vaapi/gstvaapifilter.h>
+#include <gst/vaapi/gstvaapiwindow.h>
+#include "image.h"
+#include "output.h"
+
+static gchar *g_src_format_str;
+
+static GOptionEntry g_options[] = {
+    { "src-format", 's',
+      0,
+      G_OPTION_ARG_STRING, &g_src_format_str,
+      "source surface format", NULL },
+    { NULL, }
+};
+
+#define APP_ERROR app_error_quark()
+static GQuark
+app_error_quark(void)
+{
+    static gsize g_quark;
+
+    if (g_once_init_enter(&g_quark)) {
+        gsize quark = (gsize)g_quark_from_static_string("AppError");
+        g_once_init_leave(&g_quark, quark);
+    }
+    return g_quark;
+}
+
+typedef enum {
+    APP_ERROR_NONE,
+    APP_ERROR_CREATE_TEST_SURFACE,
+} AppError;
+
+static inline void
+pause(void)
+{
+    g_print("Press any key to continue...\n");
+    getchar();
+}
+
+static GstVaapiSurface *
+create_test_surface(GstVaapiDisplay *display, guint width, guint height,
+    GError **error_ptr)
+{
+    GstVideoFormat format = GST_VIDEO_FORMAT_I420;
+    GstVaapiSurface *surface = NULL;
+    GstVaapiImage *image = NULL;
+    GError *error = NULL;
+
+    if (g_src_format_str) {
+        format = gst_vaapi_video_format_from_string(g_src_format_str);
+        if (format == GST_VIDEO_FORMAT_UNKNOWN)
+            goto error_invalid_format;
+    }
+
+    surface = gst_vaapi_surface_new_with_format(display, format, width, height);
+    if (!surface)
+        goto error_create_surface;
+
+    image = image_generate(display, format, width, height);
+    if (!image)
+        goto error_create_image;
+
+    if (!image_upload(image, surface))
+        goto error_upload_image;
+
+    gst_vaapi_object_unref(image);
+    return surface;
+
+    /* ERRORS */
+error_invalid_format:
+    error = g_error_new(APP_ERROR, APP_ERROR_CREATE_TEST_SURFACE,
+        "unknown format %s", g_src_format_str);
+    goto error_cleanup;
+error_create_surface:
+    error = g_error_new(APP_ERROR, APP_ERROR_CREATE_TEST_SURFACE,
+        "unsupported format %s", gst_vaapi_video_format_to_string(format));
+    goto error_cleanup;
+error_create_image:
+    error = g_error_new(APP_ERROR, APP_ERROR_CREATE_TEST_SURFACE,
+        "unsupported %s image", gst_vaapi_video_format_to_string(format));
+    goto error_cleanup;
+error_upload_image:
+    error = g_error_new(APP_ERROR, APP_ERROR_CREATE_TEST_SURFACE,
+        "failed to upload %s image", gst_vaapi_video_format_to_string(format));
+    goto error_cleanup;
+error_cleanup:
+    if (image)
+        gst_vaapi_object_unref(image);
+    if (surface)
+        gst_vaapi_object_unref(surface);
+    if (error_ptr)
+        *error_ptr = error;
+    else
+        g_error_free(error);
+    return NULL;
+}
+
+int
+main(int argc, char *argv[])
+{
+    GstVaapiDisplay *display;
+    GstVaapiWindow *window;
+    GstVaapiSurface *src_surface, *dst_surface;
+    GstVaapiFilter *filter = NULL;
+    GstVaapiFilterStatus status;
+    guint filter_flags = 0;
+    GError *error = NULL;
+
+    static const guint src_width        = 320;
+    static const guint src_height       = 240;
+    static const guint dst_width        = 480;
+    static const guint dst_height       = 360;
+    static const guint win_width        = 640;
+    static const guint win_height       = 480;
+
+    if (!video_output_init(&argc, argv, g_options))
+        g_error("failed to initialize video output subsystem");
+
+    display = video_output_create_display(NULL);
+    if (!display)
+        g_error("failed to create VA display");
+
+    window = video_output_create_window(display, win_width, win_height);
+    if (!window)
+        g_error("failed to create window");
+
+    src_surface = create_test_surface(display, src_width, src_height, &error);
+    if (!src_surface)
+        g_error("failed to create source VA surface: %s", error->message);
+
+    dst_surface = gst_vaapi_surface_new(display, GST_VAAPI_CHROMA_TYPE_YUV420,
+        dst_width, dst_height);
+    if (!dst_surface)
+        g_error("failed to create target VA surface");
+
+    filter = gst_vaapi_filter_new(display);
+    if (!filter)
+        g_error("failed to create video processing pipeline");
+
+    status = gst_vaapi_filter_process(filter, src_surface, dst_surface,
+        filter_flags);
+    if (status != GST_VAAPI_FILTER_STATUS_SUCCESS)
+        g_error("failed to process video filters");
+
+    gst_vaapi_window_show(window);
+
+    if (!gst_vaapi_window_put_surface(window, dst_surface, NULL, NULL,
+            GST_VAAPI_PICTURE_STRUCTURE_FRAME))
+        g_error("failed to render target surface");
+
+    pause();
+
+    gst_vaapi_filter_unref(filter);
+    gst_vaapi_object_unref(dst_surface);
+    gst_vaapi_object_unref(src_surface);
+    gst_vaapi_window_unref(window);
+    gst_vaapi_display_unref(display);
+    video_output_exit();
+    g_free(g_src_format_str);
+    return 0;
+}