diff --git a/src/gallium/drivers/radeonsi/ci/radeonsi-flakes.csv b/src/gallium/drivers/radeonsi/ci/radeonsi-flakes.csv
new file mode 100644
index 00000000000..ed06074dbb3
--- /dev/null
+++ b/src/gallium/drivers/radeonsi/ci/radeonsi-flakes.csv
@@ -0,0 +1,14 @@
+# piglit
+
+glx@glx-visuals-depth -pixmap
+glx@glx-visuals-stencil -pixmap
+spec@egl_mesa_configless_context@basic
+glx@glx-visuals-depth -pixmap
+glx@glx-visuals-stencil -pixmap
+spec@egl_mesa_configless_context@basic
+spec@egl_chromium_sync_control@conformance
+spec@egl_chromium_sync_control@conformance@eglGetSyncValuesCHROMIUM_msc_and_sbc_test
+
+# glcts
+
+KHR-GL46.sparse_texture2_tests.SparseTexture2Lookup
\ No newline at end of file
diff --git a/src/gallium/drivers/radeonsi/ci/radeonsi-run-tests.py b/src/gallium/drivers/radeonsi/ci/radeonsi-run-tests.py
index 8420d4f44d7..ce8307d5924 100755
--- a/src/gallium/drivers/radeonsi/ci/radeonsi-run-tests.py
+++ b/src/gallium/drivers/radeonsi/ci/radeonsi-run-tests.py
@@ -365,14 +365,25 @@ def select_baseline(basepath, gfx_level, gpu_name):
 
 filters_args = parse_test_filters(args.include_tests)
 baseline = select_baseline(base, gfx_level, gpu_name)
-flakes = os.path.join(
-    base, "{}-{}-flakes.csv".format(gfx_level_to_str(gfx_level), gpu_name)
-)
+flakes = [
+    f
+    for f in (
+        os.path.join(base, g)
+        for g in [
+            "radeonsi-flakes.csv",
+            "{}-{}-flakes.csv".format(gfx_level_to_str(gfx_level), gpu_name),
+        ]
+    )
+    if os.path.exists(f)
+]
+flakes_args = []
+for f in flakes:
+    flakes_args += ["--flakes", f]
 
 if os.path.exists(baseline):
     print_yellow("Baseline: {}".format(baseline))
-if os.path.exists(flakes):
-    print_yellow("[flakes {}]".format(flakes))
+if flakes_args:
+    print_yellow("Flakes: {}".format(flakes_args))
 
 # piglit test
 if args.piglit:
@@ -397,14 +408,11 @@ if args.piglit:
         str(args.jobs),
         "--skips",
         skips,
-    ] + filters_args
+    ] + filters_args + flakes_args
 
     if os.path.exists(baseline):
         cmd += ["--baseline", baseline]
 
-    if os.path.exists(flakes):
-        cmd += ["--flakes", flakes]
-
     run_cmd(cmd, args.verbose)
     failures_path = os.path.join(out, "failures.csv")
     if os.path.exists(failures_path):
@@ -446,12 +454,13 @@ if args.glcts:
         "--jobs",
         str(args.jobs),
         "--timeout",
-        "1000",
-    ] + filters_args
+        "1000"
+    ] + filters_args + flakes_args
 
     if os.path.exists(baseline):
         cmd += ["--baseline", baseline]
     cmd += deqp_args
+
     run_cmd(cmd, args.verbose)
 
     failures_path = os.path.join(out, "failures.csv")
@@ -513,7 +522,8 @@ if args.deqp:
         os.path.join(output_folder, "deqp"),
         "--suite",
         suite_filename,
-    ] + filters_args
+    ] + filters_args + flakes_args
+
     run_cmd(cmd, args.verbose)
 
     failures_path = os.path.join(out, "failures.csv")