diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 53de580e3d..1dff039f57 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -298,11 +298,13 @@ (define-public mesa
          ;; are stuck at OpenGL 2.1 instead of OpenGL 3.0+.
          "--enable-texture-float"
 
-         ;; Enable Vulkan on x86-64.
-         ;; TODO: Fix building Mesa with Vulkan drivers enabled on i686-linux.
+         ;; Enable Vulkan on i686-linux and x86-64-linux.
          ,@(match (%current-system)
              ("x86_64-linux"
               '("--with-vulkan-drivers=intel,radeon"))
+             ;; TODO: Fix intel driver on i686-linux.
+             ("i686-linux"
+              '("--with-vulkan-drivers=radeon"))
              (_
               '("")))