diff --git a/common.mak b/common.mak
index 0b86611a8ce683221398d1c84c1c858021cab1ea..d004de4e0166ddda8642dba5dfa4af7693b2b033 100644
--- a/common.mak
+++ b/common.mak
@@ -67,7 +67,7 @@ FFLDFLAGS   := $(addprefix -L$(BUILD_ROOT)/lib,$(FFLIBS)) $(LDFLAGS)
 
 EXAMPLES  := $(addprefix $(SUBDIR),$(EXAMPLES))
 OBJS      := $(addprefix $(SUBDIR),$(OBJS))
-TESTPROGS := $(addprefix $(SUBDIR),$(TESTPROGS))
+TESTPROGS := $(addprefix $(SUBDIR),$(addsuffix -test$(EXESUF),$(TESTPROGS)))
 
 DEP_LIBS := $(foreach NAME,$(FFLIBS),lib$(NAME)/$($(BUILD_SHARED:yes=S)LIBNAME))
 
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 4bb617954a04a4d06ecc15a8e12f162258849cff..037a89b2999ded4b57621159765103400f16fcfb 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -533,9 +533,9 @@ OBJS-$(HAVE_VIS)                       += sparc/dsputil_vis.o           \
 
 EXAMPLES = apiexample$(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)
+TESTPROGS = cabac dct eval fft h264 rangecoder snow
+TESTPROGS-$(ARCH_X86) += x86/cpuid
+TESTPROGS-$(HAVE_MMX) += motion
 
 DIRS = alpha arm bfin mlib ppc ps2 sh4 sparc x86
 
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 600832246e47c11ebc7efa73c68be4b68dda315c..579c7bcceb1fc0e89c71f5f8eca87e5faf42b8b7 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -243,6 +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)
+TESTPROGS = timefilter
 
 include $(SUBDIR)../subdir.mak
diff --git a/libavutil/Makefile b/libavutil/Makefile
index aa54c9383d4e4031c7f24ad0964a143ee1149d83..51c50f499216a34f6a5700b902dc3e6e4735eb23 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -41,7 +41,7 @@ OBJS = adler32.o                                                        \
        tree.o                                                           \
        utils.o                                                          \
 
-TESTPROGS = $(addsuffix -test$(EXESUF), adler32 aes base64 crc des lls md5 pca sha1 softfloat tree)
+TESTPROGS = adler32 aes base64 crc des lls md5 pca sha1 softfloat tree
 
 DIRS = arm bfin sh4 x86