diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 8d6f20a197e9585e36eac97e49cd942cabf9f7ae..67a5c6ae05baeda492416c78f6d704be1ad44f81 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -454,6 +454,11 @@ NAME=avcodec
 LIBVERSION=$(LAVCVERSION)
 LIBMAJOR=$(LAVCMAJOR)
 
+TESTS = $(addsuffix -test$(EXESUF), cabac dct eval fft h264 imgresample rangecoder snow)
+ifeq ($(ARCH_X86),yes)
+TESTS += cpuid-test$(EXESUF) motion-test$(EXESUF)
+endif
+
 include ../common.mak
 
 clean::
@@ -469,11 +474,6 @@ clean::
 	   sparc/*.o sparc/*~ \
 	   apiexample$(EXESUF) $(TESTS)
 
-TESTS = $(addsuffix -test$(EXESUF), cabac dct eval fft h264 imgresample rangecoder snow)
-ifeq ($(ARCH_X86),yes)
-TESTS += cpuid-test$(EXESUF) motion-test$(EXESUF)
-endif
-
 tests: apiexample$(EXESUF) $(TESTS)
 
 cpuid-test$(EXESUF): i386/cputest.c
diff --git a/libavutil/Makefile b/libavutil/Makefile
index 064e7e81bd66fb00e9333bbcf3f3391d4a8699c5..c5306709a08cd2a4e9d2de34dfcff7a0a412b2c1 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -41,10 +41,10 @@ NAME=avutil
 LIBVERSION=$(LAVUVERSION)
 LIBMAJOR=$(LAVUMAJOR)
 
-include ../common.mak
-
 TESTS = $(addsuffix -test$(EXESUF), adler32 aes crc des lls md5 sha1 softfloat tree)
 
+include ../common.mak
+
 tests: $(TESTS)
 
 %-test$(EXESUF): %.c $(LIBNAME)