diff --git a/libavcodec/cabac.c b/libavcodec/cabac.c
index 1e0d9e592a..e12533818f 100644
--- a/libavcodec/cabac.c
+++ b/libavcodec/cabac.c
@@ -178,7 +178,7 @@ void ff_init_cabac_states(CABACContext *c){
     }
 }
 
-#if 0 //selftest
+#ifdef TEST
 #undef random
 #define SIZE 10240
 
@@ -262,4 +262,4 @@ STOP_TIMER("get_cabac_ueg")
     return 0;
 }
 
-#endif
+#endif /* TEST */
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 66efce07ee..ffc34933d0 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -7820,7 +7820,7 @@ static inline void fill_mb_avail(H264Context *h){
 }
 #endif
 
-#if 0 //selftest
+#ifdef TEST
 #undef random
 #define COUNT 8000
 #define SIZE (COUNT*40)
@@ -7992,7 +7992,7 @@ int main(void){
 
     return 0;
 }
-#endif
+#endif /* TEST */
 
 
 static int decode_end(AVCodecContext *avctx)
diff --git a/libavcodec/rangecoder.c b/libavcodec/rangecoder.c
index baf4c816cc..829d9ab04d 100644
--- a/libavcodec/rangecoder.c
+++ b/libavcodec/rangecoder.c
@@ -109,7 +109,7 @@ int ff_rac_terminate(RangeCoder *c){
     return c->bytestream - c->bytestream_start;
 }
 
-#if 0 //selftest
+#ifdef TEST
 #define SIZE 10240
 int main(void){
     RangeCoder c;
@@ -148,4 +148,4 @@ STOP_TIMER("get_rac")
 
     return 0;
 }
-#endif
+#endif /* TEST */
diff --git a/libavcodec/snow.c b/libavcodec/snow.c
index 1099e34287..64504fec47 100644
--- a/libavcodec/snow.c
+++ b/libavcodec/snow.c
@@ -4775,7 +4775,7 @@ AVCodec snow_encoder = {
 #endif
 
 
-#if 0
+#ifdef TEST
 #undef malloc
 #undef free
 #undef printf
@@ -4924,4 +4924,4 @@ int64_t g=0;
 }
     return 0;
 }
-#endif /* 0 */
+#endif /* TEST */