diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index dd4d1798c8..3bc2d78dde 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -437,7 +437,7 @@ tests: apiexample $(TESTS)
 apiexample: apiexample.o $(LIB)
 
 cpuid_test: i386/cputest.c
-	$(CC) $(CFLAGS) -D__TEST__ -o $@ $<
+	$(CC) $(CFLAGS) -DTEST -o $@ $<
 
 imgresample-test: imgresample.c $(LIB)
 	$(CC) $(CFLAGS) -DTEST -o $@ $^ $(EXTRALIBS)
diff --git a/libavcodec/i386/cputest.c b/libavcodec/i386/cputest.c
index b8f505564a..d039ffef60 100644
--- a/libavcodec/i386/cputest.c
+++ b/libavcodec/i386/cputest.c
@@ -119,7 +119,7 @@ int mm_support(void)
     return rval;
 }
 
-#ifdef __TEST__
+#ifdef TEST
 int main ( void )
 {
   int mm_flags;