diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index bfa80b1e13..ec3a5d8cee 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -342,7 +342,8 @@ (define-public mesa
              (substitute* "src/intel/genxml/gen_pack_header.py"
                (("/usr/bin/env python2") (which "python")))
              #t))
-         ,@(if (string-prefix? "i686" (%current-system))
+         ,@(if (string-prefix? "i686" (or (%current-target-system)
+                                          (%current-system)))
                ;; Disable new test from Mesa 19 that fails on i686.  Upstream
                ;; report: <https://bugs.freedesktop.org/show_bug.cgi?id=110612>.
                `((add-after 'unpack 'disable-failing-test