diff --git a/tests/check/meson.build b/tests/check/meson.build
index 65bd7ea506..fdd4853c4c 100644
--- a/tests/check/meson.build
+++ b/tests/check/meson.build
@@ -3,7 +3,6 @@ have_registry = true # FIXME get_option('registry')
 # name, condition when to skip the test and extra dependencies
 base_tests = [
   [ 'gst/typefindfunctions.c', not have_registry ],
-  [ 'libs/allocators.c', host_machine.system() != 'linux' ],
   [ 'libs/audio.c' ],
   [ 'libs/audiocdsrc.c' ],
   [ 'libs/audiodecoder.c' ],
@@ -18,12 +17,9 @@ base_tests = [
   [ 'libs/profile.c' ],
   [ 'libs/rtpbasedepayload.c' ],
   [ 'libs/rtpbasepayload.c' ],
-  [ 'libs/rtp.c' ],
   [ 'libs/rtsp.c' ],
-  [ 'libs/rtspconnection.c' ],
   [ 'libs/sdp.c' ],
   [ 'libs/tag.c' ],
-  [ 'libs/video.c' ],
   [ 'libs/videoanc.c' ],
   [ 'libs/videoencoder.c' ],
   [ 'libs/videodecoder.c' ],
@@ -38,43 +34,54 @@ base_tests = [
   [ 'elements/audiorate.c' ],
   [ 'elements/audiotestsrc.c' ],
   [ 'elements/audioresample.c' ],
-  [ 'elements/libvisual.c', not is_variable('libvisual_dep') or not libvisual_dep.found() ],
   [ 'elements/decodebin.c' ],
-  [ 'elements/encodebin.c', not theoraenc_dep.found() or not vorbisenc_dep.found() ],
-  [ 'elements/multifdsink.c', not core_conf.has('HAVE_SYS_SOCKET_H') or not core_conf.has('HAVE_UNISTD_H') ],
-  # FIXME: multisocketsink test on windows/msvc
-  [ 'elements/multisocketsink.c', not core_conf.has('HAVE_SYS_SOCKET_H') or not core_conf.has('HAVE_UNISTD_H') ],
   [ 'elements/overlaycomposition.c' ],
   [ 'elements/playbin.c' ],
-  [ 'elements/playbin-complex.c', not ogg_dep.found() ],
   [ 'elements/playsink.c' ],
   [ 'elements/streamsynchronizer.c' ],
   [ 'elements/subparse.c' ],
-  [ 'elements/textoverlay.c', not pango_dep.found() ],
   [ 'elements/urisourcebin.c' ],
   [ 'elements/videoconvert.c' ],
   [ 'elements/videorate.c' ],
   [ 'elements/videoscale.c' ],
   [ 'elements/videotestsrc.c' ],
   [ 'elements/volume.c', false, [ gst_controller_dep ] ],
-  [ 'elements/vorbisdec.c', not vorbis_dep.found(), [ vorbis_dep, vorbisenc_dep ] ],
-  [ 'elements/vorbistag.c', not vorbisenc_dep.found(), [ vorbis_dep, vorbisenc_dep ] ],
   [ 'generic/clock-selection.c' ],
   [ 'generic/states.c', false, [ gmodule_dep ] ],
   [ 'pipelines/simple-launch-lines.c' ],
   [ 'pipelines/basetime.c' ],
   [ 'pipelines/capsfilter-renegotiation.c' ],
   [ 'pipelines/gio.c' ],
-  [ 'pipelines/oggmux.c', not ogg_dep.found(), [ ogg_dep, ] ],
   [ 'pipelines/streamsynchronizer.c' ],
-  # FIXME: tcp test on windows/msvc
-  [ 'pipelines/tcp.c', not core_conf.has('HAVE_SYS_SOCKET_H') or not core_conf.has('HAVE_UNISTD_H'), [giounix_dep] ],
-  [ 'pipelines/theoraenc.c', not theoraenc_dep.found(), [ theoraenc_dep ] ],
-  [ 'pipelines/vorbisenc.c', not vorbisenc_dep.found() ],
-  [ 'pipelines/vorbisdec.c', not vorbisenc_dep.found(),],
 ]
 
-if build_gstgl
+# FIXME: unistd dependency, unstable or not tested yet on windows
+if host_machine.system() != 'windows'
+  base_tests += [
+    [ 'libs/allocators.c', host_machine.system() != 'linux' ],
+    [ 'libs/rtp.c' ],
+    [ 'libs/rtspconnection.c' ],
+    [ 'libs/video.c' ],
+    [ 'elements/libvisual.c', not is_variable('libvisual_dep') or not libvisual_dep.found() ],
+    [ 'elements/encodebin.c', not theoraenc_dep.found() or not vorbisenc_dep.found() ],
+    [ 'elements/multifdsink.c', not core_conf.has('HAVE_SYS_SOCKET_H') or not core_conf.has('HAVE_UNISTD_H') ],
+    # FIXME: multisocketsink test on windows/msvc
+    [ 'elements/multisocketsink.c', not core_conf.has('HAVE_SYS_SOCKET_H') or not core_conf.has('HAVE_UNISTD_H') ],
+    [ 'elements/playbin-complex.c', not ogg_dep.found() ],
+    [ 'elements/textoverlay.c', not pango_dep.found() ],
+    [ 'elements/vorbisdec.c', not vorbis_dep.found(), [ vorbis_dep, vorbisenc_dep ] ],
+    [ 'elements/vorbistag.c', not vorbisenc_dep.found(), [ vorbis_dep, vorbisenc_dep ] ],
+    [ 'pipelines/oggmux.c', not ogg_dep.found(), [ ogg_dep, ] ],
+    # FIXME: tcp test on windows/msvc
+    [ 'pipelines/tcp.c', not core_conf.has('HAVE_SYS_SOCKET_H') or not core_conf.has('HAVE_UNISTD_H'), [giounix_dep] ],
+    [ 'pipelines/theoraenc.c', not theoraenc_dep.found(), [ theoraenc_dep ] ],
+    [ 'pipelines/vorbisenc.c', not vorbisenc_dep.found() ],
+    [ 'pipelines/vorbisdec.c', not vorbisenc_dep.found() ],
+  ]
+endif
+
+# FIXME: Unstable on Windows
+if build_gstgl and host_machine.system() != 'windows'
   base_tests += [
     [ 'libs/gstglcolorconvert.c', not build_gstgl, [gstgl_dep]],
     [ 'libs/gstglcontext.c', not build_gstgl, [gstgl_dep]],