diff --git a/Makefile b/Makefile
index c5e720363f..5dd4cf1a8a 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ $(PROGS): %$(EXESUF): %_g$(EXESUF)
 	cp -p $< $@
 	$(STRIP) $@
 
-SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTS EXAMPLES
+SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES
 
 define RESET
 $(1) :=
diff --git a/common.mak b/common.mak
index d0dc7bec8e..cc77dc530b 100644
--- a/common.mak
+++ b/common.mak
@@ -54,20 +54,20 @@ install: install-libs install-headers
 
 uninstall: uninstall-libs uninstall-headers
 
-.PHONY: all depend dep *clean install* uninstall* examples tests
+.PHONY: all depend dep *clean install* uninstall* examples testprogs
 endif
 
 CFLAGS   += $(CFLAGS-yes)
 OBJS     += $(OBJS-yes)
 FFLIBS   := $(FFLIBS-yes) $(FFLIBS)
-TESTS    += $(TESTS-yes)
+TESTPROGS    += $(TESTPROGS-yes)
 
 FFEXTRALIBS := $(addprefix -l,$(addsuffix $(BUILDSUF),$(FFLIBS))) $(EXTRALIBS)
 FFLDFLAGS   := $(addprefix -L$(BUILD_ROOT)/lib,$(FFLIBS)) $(LDFLAGS)
 
 EXAMPLES := $(addprefix $(SUBDIR),$(EXAMPLES))
 OBJS  := $(addprefix $(SUBDIR),$(OBJS))
-TESTS := $(addprefix $(SUBDIR),$(TESTS))
+TESTPROGS := $(addprefix $(SUBDIR),$(TESTPROGS))
 
 DEP_LIBS:=$(foreach NAME,$(FFLIBS),lib$(NAME)/$($(BUILD_SHARED:yes=S)LIBNAME))
 
@@ -98,7 +98,7 @@ $(SUBDIR)x86/%.d: $(SUBDIR)x86/%.asm
 	$(YASM) $(YASMFLAGS) -I $$(<D)/ -M -o $$(@:%.d=%.o) $$< > $$@
 
 clean::
-	rm -f $(EXAMPLES) $(TESTS) $(addprefix $(SUBDIR),$(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
+	rm -f $(EXAMPLES) $(TESTPROGS) $(addprefix $(SUBDIR),$(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
 	    $(addprefix $(SUBDIR), $(foreach suffix,$(CLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS))))
 
 distclean:: clean
@@ -109,6 +109,6 @@ endef
 $(eval $(RULES))
 
 examples: $(EXAMPLES)
-tests: $(TESTS)
+testprogs: $(TESTPROGS)
 
 -include $(DEPS)
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 4d75d7b64b..a1b70c8f54 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -531,9 +531,9 @@ OBJS-$(HAVE_VIS)                       += sparc/dsputil_vis.o           \
 
 EXAMPLES = apiexample$(EXESUF)
 
-TESTS = $(addsuffix -test$(EXESUF), cabac dct eval fft h264 rangecoder snow)
-TESTS-$(ARCH_X86) += x86/cpuid-test$(EXESUF)
-TESTS-$(HAVE_MMX) += motion-test$(EXESUF)
+TESTPROGS = $(addsuffix -test$(EXESUF), cabac dct eval fft h264 rangecoder snow)
+TESTPROGS-$(ARCH_X86) += x86/cpuid-test$(EXESUF)
+TESTPROGS-$(HAVE_MMX) += motion-test$(EXESUF)
 
 DIRS = alpha arm bfin mlib ppc ps2 sh4 sparc x86
 
diff --git a/libavformat/Makefile b/libavformat/Makefile
index f2285d7716..600832246e 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -243,4 +243,6 @@ OBJS-$(CONFIG_RTP_PROTOCOL)              += rtpproto.o
 OBJS-$(CONFIG_TCP_PROTOCOL)              += tcp.o
 OBJS-$(CONFIG_UDP_PROTOCOL)              += udp.o
 
+TESTPROGS = $(addsuffix -test$(EXESUF), timefilter)
+
 include $(SUBDIR)../subdir.mak
diff --git a/libavutil/Makefile b/libavutil/Makefile
index 2ea95e76cb..aa54c9383d 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -41,7 +41,7 @@ OBJS = adler32.o                                                        \
        tree.o                                                           \
        utils.o                                                          \
 
-TESTS = $(addsuffix -test$(EXESUF), adler32 aes base64 crc des lls md5 pca sha1 softfloat tree)
+TESTPROGS = $(addsuffix -test$(EXESUF), adler32 aes base64 crc des lls md5 pca sha1 softfloat tree)
 
 DIRS = arm bfin sh4 x86