diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 11873eecae..8012b69f61 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -1209,13 +1209,13 @@ SKIPHEADERS-$(CONFIG_VDPAU)            += vdpau.h vdpau_internal.h
 SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX)     += videotoolbox.h vt_internal.h
 SKIPHEADERS-$(CONFIG_V4L2_M2M)         += v4l2_buffers.h v4l2_context.h v4l2_m2m.h
 
-TESTPROGS = avpacket                                                    \
+TESTPROGS = avcodec                                                     \
+            avpacket                                                    \
             celp_math                                                   \
             codec_desc                                                  \
             htmlsubtitles                                               \
             jpeg2000dwt                                                 \
             mathops                                                    \
-            utils                                                       \
 
 TESTPROGS-$(CONFIG_CABAC)                 += cabac
 TESTPROGS-$(CONFIG_DCT)                   += avfft
diff --git a/libavcodec/tests/utils.c b/libavcodec/tests/avcodec.c
similarity index 100%
rename from libavcodec/tests/utils.c
rename to libavcodec/tests/avcodec.c
diff --git a/tests/fate/libavcodec.mak b/tests/fate/libavcodec.mak
index 682296914a..aa199e0308 100644
--- a/tests/fate/libavcodec.mak
+++ b/tests/fate/libavcodec.mak
@@ -79,10 +79,10 @@ FATE_LIBAVCODEC-$(CONFIG_JPEG2000_ENCODER) += fate-j2k-dwt
 fate-j2k-dwt: libavcodec/tests/jpeg2000dwt$(EXESUF)
 fate-j2k-dwt: CMD = run libavcodec/tests/jpeg2000dwt$(EXESUF)
 
-FATE_LIBAVCODEC-yes += fate-libavcodec-utils
-fate-libavcodec-utils: libavcodec/tests/utils$(EXESUF)
-fate-libavcodec-utils: CMD = run libavcodec/tests/utils$(EXESUF)
-fate-libavcodec-utils: CMP = null
+FATE_LIBAVCODEC-yes += fate-libavcodec-avcodec
+fate-libavcodec-avcodec: libavcodec/tests/avcodec$(EXESUF)
+fate-libavcodec-avcodec: CMD = run libavcodec/tests/avcodec$(EXESUF)
+fate-libavcodec-avcodec: CMP = null
 
 FATE_LIBAVCODEC-yes += fate-libavcodec-huffman
 fate-libavcodec-huffman: libavcodec/tests/mjpegenc_huffman$(EXESUF)