diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index a30e0b9b40..411bea3ab6 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -387,7 +387,7 @@ (define (first-subdirectory/absolute directory)
                 #$(cond
                    ((%current-target-system)
                     #~(display "Cannot validate native-comp on cross builds.\n"))
-                   ((string=? (%current-system) "armhf-linux")
+                   ((member (%current-system) '("armhf-linux" "i686-linux"))
                     #~(display "Integrity test is broken on armhf.\n"))
                    (else
                     #~(invoke