diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index b7b1c1f5b1..b74f8749d5 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -469,7 +469,7 @@ clean::
 	   sparc/*.o sparc/*~ \
 	   apiexample $(TESTS)
 
-TESTS= imgresample-test fft-test dct-test
+TESTS = $(addsuffix -test, cabac dct eval fft h264 imgresample rangecoder snow)
 ifeq ($(ARCH_X86),yes)
 TESTS+= cpuid-test motion-test
 endif
@@ -479,15 +479,14 @@ tests: apiexample $(TESTS)
 apiexample: apiexample.o $(LIBNAME)
 
 cpuid-test: i386/cputest.c
-	$(CC) $(CFLAGS) -DTEST -o $@ $<
 
 dct-test: dct-test.o fdctref.o $(LIBNAME)
 
 fft-test: fft-test.o $(LIBNAME)
 
-imgresample-test: imgresample.c $(LIBNAME)
-	$(CC) $(CFLAGS) -DTEST -o $@ $^ $(EXTRALIBS)
-
 motion-test: motion-test.o $(LIBNAME)
 
+%-test: %.c $(LIBNAME)
+	$(CC) $(CFLAGS) $(LDFLAGS) -DTEST -o $@ $^ $(EXTRALIBS)
+
 .PHONY: tests