diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d8019d5d5..765fb5dd9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,7 +34,7 @@ fedora-x86_64:
     - ninja -C _build
     - mkdir -p _coverage
     - lcov --config-file .gitlab-ci/lcovrc --directory _build --capture --initial --output-file "_coverage/${CI_JOB_NAME}-baseline.lcov"
-    - meson test -C _build --timeout-multiplier ${MESON_TEST_TIMEOUT_MULTIPLIER}
+    - meson test -C _build --timeout-multiplier ${MESON_TEST_TIMEOUT_MULTIPLIER} --no-suite flaky
     - lcov --config-file .gitlab-ci/lcovrc --directory _build --capture --output-file "_coverage/${CI_JOB_NAME}.lcov"
     # FIXME: We should run all installed tests, but do only this one for now
     # because it cannot run uninstalled. Reconfigure with dtrace disabled
@@ -142,7 +142,7 @@ freebsd-11-x86_64:
     # FIXME: extattr(2) support: https://gitlab.gnome.org/GNOME/glib/issues/1404
     - meson ${MESON_COMMON_OPTIONS} -Db_lundef=false -Diconv=gnu -Dxattr=false _build
     - ninja -C _build
-    - meson test -C _build --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}"
+    - meson test -C _build --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" --no-suite flaky
   except:
     - tags
   artifacts:
diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat
index c3b19cd34..e5f807387 100644
--- a/.gitlab-ci/test-msvc.bat
+++ b/.gitlab-ci/test-msvc.bat
@@ -10,7 +10,7 @@ meson _build || goto :error
 ninja -C _build || goto :error
 
 :: FIXME: dont ignore test errors
-meson test -C _build --timeout-multiplier %MESON_TEST_TIMEOUT_MULTIPLIER%
+meson test -C _build --timeout-multiplier %MESON_TEST_TIMEOUT_MULTIPLIER% --no-suite flaky
 
 :: FIXME: can we get code coverage support?
 
diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh
index ed129c038..4cb710857 100755
--- a/.gitlab-ci/test-msys2.sh
+++ b/.gitlab-ci/test-msys2.sh
@@ -51,7 +51,7 @@ ninja
     --output-file "${DIR}/_coverage/${CI_JOB_NAME}-baseline.lcov"
 
 # FIXME: fix the test suite
-meson test --timeout-multiplier ${MESON_TEST_TIMEOUT_MULTIPLIER} || true
+meson test --timeout-multiplier ${MESON_TEST_TIMEOUT_MULTIPLIER} --no-suite flaky || true
 
 "${LCOV}" \
     --quiet \
diff --git a/gio/tests/meson.build b/gio/tests/meson.build
index 5bbc07176..e969d9246 100644
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
@@ -55,7 +55,7 @@ gio_tests = {
   'memory-output-stream' : {},
   'monitor' : {},
   'mount-operation' : {},
-  'network-address' : {'extra_sources': ['mock-resolver.c']},
+  'network-address' : {'extra_sources': ['mock-resolver.c'], 'suite': ['flaky']},
   'network-monitor' : {},
   'network-monitor-race' : {},
   'permission' : {},
@@ -73,7 +73,7 @@ gio_tests = {
   'vfs' : {},
   'volumemonitor' : {},
   'glistmodel' : {},
-  'testfilemonitor' : {'suite' : ['slow']},
+  'testfilemonitor' : {'suite' : ['slow', 'flaky']},
   'thumbnail-verification' : {},
   'tls-certificate' : {'extra_sources' : ['gtesttlsbackend.c']},
   'tls-interaction' : {'extra_sources' : ['gtesttlsbackend.c']},
@@ -236,10 +236,10 @@ if host_machine.system() != 'windows'
         'extra_sources' : extra_sources,
         'suite' : ['slow'],
       },
-      'gdbus-auth' : {'extra_sources' : extra_sources},
-      'gdbus-bz627724' : {'extra_sources' : extra_sources},
+      'gdbus-auth' : {'extra_sources' : extra_sources, 'suite': ['flaky']},
+      'gdbus-bz627724' : {'extra_sources' : extra_sources, 'suite': ['flaky']},
       'gdbus-close-pending' : {'extra_sources' : extra_sources},
-      'gdbus-connection' : {'extra_sources' : extra_sources},
+      'gdbus-connection' : {'extra_sources' : extra_sources, 'suite': ['flaky']},
       'gdbus-connection-loss' : {'extra_sources' : extra_sources},
       'gdbus-connection-slow' : {'extra_sources' : extra_sources},
       'gdbus-error' : {'extra_sources' : extra_sources},
@@ -262,7 +262,7 @@ if host_machine.system() != 'windows'
       },
       'gdbus-threading' : {
         'extra_sources' : extra_sources,
-        'suite' : ['slow'],
+        'suite' : ['slow', 'flaky'],
       },
       'gmenumodel' : {
         'extra_sources' : extra_sources,