diff --git a/src/freedreno/ci/freedreno-a618-fails.txt b/src/freedreno/ci/freedreno-a618-fails.txt
index 50ee80bfd29..51d67defb80 100644
--- a/src/freedreno/ci/freedreno-a618-fails.txt
+++ b/src/freedreno/ci/freedreno-a618-fails.txt
@@ -34,8 +34,6 @@ KHR-GL45.texture_cube_map_array.color_depth_attachments,Fail
 #
 
 # Various limits we cannot or do not support:
-KHR-GL45.limits.max_array_texture_layers,Fail
-KHR-GL45.limits.max_framebuffer_layers,Fail
 KHR-GL45.limits.max_vertex_streams,Fail
 
 # Shader compile fails:
diff --git a/src/freedreno/ci/freedreno-a630-fails.txt b/src/freedreno/ci/freedreno-a630-fails.txt
index 788498fc00c..69b7a3509f0 100644
--- a/src/freedreno/ci/freedreno-a630-fails.txt
+++ b/src/freedreno/ci/freedreno-a630-fails.txt
@@ -34,8 +34,6 @@ KHR-GL45.texture_cube_map_array.color_depth_attachments,Fail
 #
 
 # Various limits we cannot or do not support:
-KHR-GL45.limits.max_array_texture_layers,Fail
-KHR-GL45.limits.max_framebuffer_layers,Fail
 KHR-GL45.limits.max_vertex_streams,Fail
 
 # Shader compile fails:
diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c b/src/gallium/drivers/freedreno/freedreno_screen.c
index bcbe465e25a..a4394f8c9a3 100644
--- a/src/gallium/drivers/freedreno/freedreno_screen.c
+++ b/src/gallium/drivers/freedreno/freedreno_screen.c
@@ -509,8 +509,9 @@ fd_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
       return 12;
 
    case PIPE_CAP_MAX_TEXTURE_ARRAY_LAYERS:
-      return (is_a3xx(screen) || is_a4xx(screen) || is_a5xx(screen) ||
-              is_a6xx(screen))
+      if (is_a6xx(screen))
+         return 2048;
+      return (is_a3xx(screen) || is_a4xx(screen) || is_a5xx(screen))
                 ? 256
                 : 0;