diff --git a/configure b/configure
index b669523ef0..b7a8b77f56 100755
--- a/configure
+++ b/configure
@@ -1950,18 +1950,16 @@ doc_deps_any="manpages htmlpages podpages txtpages"
 # tests
 colormatrix1_test_deps="colormatrix_filter"
 colormatrix2_test_deps="colormatrix_filter"
-flashsv2_test_deps="zlib"
 mpg_test_deps="mpeg1system_muxer mpegps_demuxer"
-mpng_test_deps="zlib"
+png_test_deps="zlib"
 pp_test_deps="mp_filter"
 pp2_test_deps="mp_filter"
 pp3_test_deps="mp_filter"
 pp4_test_deps="mp_filter"
 pp5_test_deps="mp_filter"
 pp6_test_deps="mp_filter"
+seek_flashsv_flv_test_deps="zlib"
 seek_lavf_mxf_d10_test_deps="mxf_d10_test"
-zlib_test_deps="zlib"
-zmbv_test_deps="zlib"
 
 test_deps(){
     suf1=$1
diff --git a/tests/fate/lossless-video.mak b/tests/fate/lossless-video.mak
index 2ae035b998..cbf7f5292a 100644
--- a/tests/fate/lossless-video.mak
+++ b/tests/fate/lossless-video.mak
@@ -40,11 +40,13 @@ fate-mszh: CMD = framecrc -i $(SAMPLES)/lcl/mszh-1frame.avi
 FATE_LOSSLESS_VIDEO += fate-vble
 fate-vble: CMD = framecrc -i $(SAMPLES)/vble/flowers-partial-2MB.avi
 
-FATE_LOSSLESS_VIDEO += fate-zlib
+FATE_LOSSLESS_VIDEO-$(CONFIG_ZLIB) += fate-zlib
 fate-zlib: CMD = framecrc -i $(SAMPLES)/lcl/zlib-1frame.avi
 
-FATE_LOSSLESS_VIDEO += fate-zerocodec
+FATE_LOSSLESS_VIDEO-$(CONFIG_ZLIB) += fate-zerocodec
 fate-zerocodec: CMD = framecrc -i $(SAMPLES)/zerocodec/sample-zeco.avi
 
+FATE_LOSSLESS_VIDEO += $(FATE_LOSSLESS_VIDEO-yes)
+
 FATE_SAMPLES_FFMPEG += $(FATE_LOSSLESS_VIDEO)
 fate-lossless-video: $(FATE_LOSSLESS_VIDEO)
diff --git a/tests/fate/qt.mak b/tests/fate/qt.mak
index c626245157..3068ac63ec 100644
--- a/tests/fate/qt.mak
+++ b/tests/fate/qt.mak
@@ -46,8 +46,10 @@ fate-rpza: CMD = framecrc -i $(SAMPLES)/rpza/rpza2.mov -t 2 -pix_fmt rgb24
 FATE_QT += fate-svq1
 fate-svq1: CMD = framecrc -i $(SAMPLES)/svq1/marymary-shackles.mov -an -t 10
 
-FATE_QT += fate-svq3
+FATE_QT-$(CONFIG_ZLIB) += fate-svq3
 fate-svq3: CMD = framecrc -i $(SAMPLES)/svq3/Vertical400kbit.sorenson3.mov -t 6 -an
 
+FATE_QT += $(FATE_QT-yes)
+
 FATE_SAMPLES_FFMPEG += $(FATE_QT)
 fate-qt: $(FATE_QT)
diff --git a/tests/fate/screen.mak b/tests/fate/screen.mak
index eb7bafe9c3..14264a6547 100644
--- a/tests/fate/screen.mak
+++ b/tests/fate/screen.mak
@@ -32,7 +32,7 @@ fate-tscc-15bit: CMD = framecrc -i $(SAMPLES)/tscc/oneminute.avi -t 15 -pix_fmt
 FATE_TSCC += fate-tscc-32bit
 fate-tscc-32bit: CMD = framecrc -i $(SAMPLES)/tscc/2004-12-17-uebung9-partial.avi -pix_fmt rgb24 -an
 
-FATE_SCREEN += $(FATE_TSCC)
+FATE_SCREEN-$(CONFIG_ZLIB) += $(FATE_TSCC)
 fate-tscc: $(FATE_TSCC)
 
 FATE_VMNC += fate-vmnc-16bit
@@ -56,8 +56,10 @@ fate-zmbv-16bit: CMD = framecrc -i $(SAMPLES)/zmbv/zmbv_16bit.avi -pix_fmt rgb24
 FATE_ZMBV += fate-zmbv-32bit
 fate-zmbv-32bit: CMD = framecrc -i $(SAMPLES)/zmbv/zmbv_32bit.avi -pix_fmt rgb24 -t 25
 
-FATE_SCREEN += $(FATE_ZMBV)
+FATE_SCREEN-$(CONFIG_ZLIB) += $(FATE_ZMBV)
 fate-zmbv: $(FATE_ZMBV)
 
+FATE_SCREEN += $(FATE_SCREEN-yes)
+
 FATE_SAMPLES_FFMPEG += $(FATE_SCREEN)
 fate-screen: $(FATE_SCREEN)
diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak
index d4c4cf60be..f4e39b8ce7 100644
--- a/tests/fate/vcodec.mak
+++ b/tests/fate/vcodec.mak
@@ -59,12 +59,12 @@ fate-vsynth%-ffv1:               ENCOPTS = -strict -2
 
 FATE_VCODEC += ffvhuff
 
-FATE_VCODEC += flashsv
+FATE_VCODEC-$(CONFIG_ZLIB) += flashsv
 fate-vsynth%-flashsv:            ENCOPTS = -sws_flags neighbor+full_chroma_int
 fate-vsynth%-flashsv:            DECOPTS = -sws_flags area
 fate-vsynth%-flashsv:            FMT     = flv
 
-FATE_VCODEC += flashsv2
+FATE_VCODEC-$(CONFIG_ZLIB) += flashsv2
 fate-vsynth%-flashsv2:           ENCOPTS = -sws_flags neighbor+full_chroma_int -strict experimental -compression_level 0
 fate-vsynth%-flashsv2:           DECOPTS = -sws_flags area
 fate-vsynth%-flashsv2:           FMT     = flv
@@ -193,7 +193,7 @@ fate-vsynth%-msmpeg4:            ENCOPTS = -qscale 10
 FATE_VCODEC += msmpeg4v2
 fate-vsynth%-msmpeg4v2:          ENCOPTS = -qscale 10
 
-FATE_VCODEC += mpng
+FATE_VCODEC-$(CONFIG_ZLIB) += mpng
 fate-vsynth%-mpng:               CODEC   = png
 
 FATE_VCODEC += msvideo1
@@ -277,8 +277,9 @@ FATE_VCODEC += yuv4
 
 FATE_VCODEC += y41p
 
-FATE_VCODEC += zlib
+FATE_VCODEC-$(CONFIG_ZLIB) += zlib
 
+FATE_VCODEC += $(FATE_VCODEC-yes)
 
 FATE_VSYNTH1 = $(FATE_VCODEC:%=fate-vsynth1-%)
 FATE_VSYNTH2 = $(FATE_VCODEC:%=fate-vsynth2-%)
diff --git a/tests/fate/video.mak b/tests/fate/video.mak
index e5dd6201c3..65b98a47d8 100644
--- a/tests/fate/video.mak
+++ b/tests/fate/video.mak
@@ -49,7 +49,7 @@ fate-cdgraphics: CMD = framecrc -i $(SAMPLES)/cdgraphics/BrotherJohn.cdg -pix_fm
 FATE_VIDEO += fate-cljr
 fate-cljr: CMD = framecrc -i $(SAMPLES)/cljr/testcljr-partial.avi
 
-FATE_VIDEO += fate-corepng
+FATE_VIDEO-$(CONFIG_ZLIB) += fate-corepng
 fate-corepng: CMD = framecrc -i $(SAMPLES)/png1/corepng-partial.avi
 
 FATE_VIDEO += fate-creatureshock-avs
@@ -97,7 +97,7 @@ fate-dxa-feeble: CMD = framecrc -i $(SAMPLES)/dxa/meetsquid.dxa -t 2 -pix_fmt rg
 FATE_DXA += fate-dxa-scummvm
 fate-dxa-scummvm: CMD = framecrc -i $(SAMPLES)/dxa/scummvm.dxa -pix_fmt rgb24
 
-FATE_VIDEO += $(FATE_DXA)
+FATE_VIDEO-$(CONFIG_ZLIB) += $(FATE_DXA)
 fate-dxa: $(FATE_DXA)
 
 FATE_SAMPLES_PCM += fate-film-cvid