diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile
index 33e2c09dc6..0758746bc4 100644
--- a/tests/checkasm/Makefile
+++ b/tests/checkasm/Makefile
@@ -1,5 +1,6 @@
 # libavcodec tests
 AVCODECOBJS-$(CONFIG_H264PRED) += h264pred.o
+AVCODECOBJS-$(CONFIG_H264QPEL) += h264qpel.o
 
 CHECKASMOBJS-$(CONFIG_AVCODEC) += $(AVCODECOBJS-yes)
 
diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c
index f44f9813b2..41ea9efc61 100644
--- a/tests/checkasm/checkasm.c
+++ b/tests/checkasm/checkasm.c
@@ -56,6 +56,9 @@
 static void (* const tests[])(void) = {
 #if CONFIG_H264PRED
     checkasm_check_h264pred,
+#endif
+#if CONFIG_H264QPEL
+    checkasm_check_h264qpel,
 #endif
     NULL
 };
diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h
index 039aed7984..9031725f82 100644
--- a/tests/checkasm/checkasm.h
+++ b/tests/checkasm/checkasm.h
@@ -30,6 +30,7 @@
 #include "libavutil/timer.h"
 
 void checkasm_check_h264pred(void);
+void checkasm_check_h264qpel(void);
 
 intptr_t (*checkasm_check_func(intptr_t (*func)(), const char *name, ...))() av_printf_format(2, 3);
 int checkasm_bench_func(void);
diff --git a/tests/checkasm/h264qpel.c b/tests/checkasm/h264qpel.c
new file mode 100644
index 0000000000..b574b0be55
--- /dev/null
+++ b/tests/checkasm/h264qpel.c
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2015 Henrik Gramner
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * FFmpeg 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with FFmpeg; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <string.h>
+#include "checkasm.h"
+#include "libavcodec/h264qpel.h"
+#include "libavutil/common.h"
+#include "libavutil/intreadwrite.h"
+
+static const uint32_t pixel_mask[3] = { 0xffffffff, 0x01ff01ff, 0x03ff03ff };
+
+#define SIZEOF_PIXEL ((bit_depth + 7) / 8)
+#define BUF_SIZE (2*16*(16+3+4))
+
+#define randomize_buffers()\
+    do {\
+        uint32_t mask = pixel_mask[bit_depth-8];\
+        int k;\
+        for (k = 0; k < BUF_SIZE; k += 4) {\
+            uint32_t r = rnd() & mask;\
+            AV_WN32A(buf0+k, r);\
+            AV_WN32A(buf1+k, r);\
+            r = rnd();\
+            AV_WN32A(dst0+k, r);\
+            AV_WN32A(dst1+k, r);\
+        }\
+    } while (0)
+
+#define src0 (buf0 + 3*2*16) /* h264qpel functions read data from negative src pointer offsets */
+#define src1 (buf1 + 3*2*16)
+
+void checkasm_check_h264qpel(void)
+{
+    DECLARE_ALIGNED(16, uint8_t, buf0)[BUF_SIZE];
+    DECLARE_ALIGNED(16, uint8_t, buf1)[BUF_SIZE];
+    DECLARE_ALIGNED(16, uint8_t, dst0)[BUF_SIZE];
+    DECLARE_ALIGNED(16, uint8_t, dst1)[BUF_SIZE];
+    H264QpelContext h;
+    int op, bit_depth, i, j;
+
+    for (op = 0; op < 2; op++) {
+        qpel_mc_func (*tab)[16] = op ? h.avg_h264_qpel_pixels_tab : h.put_h264_qpel_pixels_tab;
+        const char *op_name = op ? "avg" : "put";
+
+        for (bit_depth = 8; bit_depth <= 10; bit_depth++) {
+            ff_h264qpel_init(&h, bit_depth);
+            for (i = 0; i < (op ? 3 : 4); i++) {
+                int size = 16 >> i;
+                for (j = 0; j < 16; j++) {
+                    if (check_func(tab[i][j], "%s_h264_qpel_%d_mc%d%d_%d", op_name, size, j&3, j>>2, bit_depth)) {
+                        randomize_buffers();
+                        call_ref(dst0, src0, (ptrdiff_t)size*SIZEOF_PIXEL);
+                        call_new(dst1, src1, (ptrdiff_t)size*SIZEOF_PIXEL);
+                        if (memcmp(buf0, buf1, BUF_SIZE) || memcmp(dst0, dst1, BUF_SIZE))
+                            fail();
+                        bench_new(dst1, src1, (ptrdiff_t)size*SIZEOF_PIXEL);
+                    }
+                }
+            }
+        }
+        report("%s_h264_qpel", op_name);
+    }
+}