diff --git a/sys-boot/grub/grub-2.02_beta2-r9.ebuild b/sys-boot/grub/grub-2.02_beta2-r9.ebuild
index 3bc7b41de7116..88bce98d42e98 100644
--- a/sys-boot/grub/grub-2.02_beta2-r9.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -109,7 +109,7 @@ RDEPEND+="
 DEPEND+=" !!=media-libs/freetype-2.5.4"
 
 STRIP_MASK="*/grub/*/*.{mod,img}"
-RESTRICT="test"
+RESTRICT="!test? ( test )"
 
 QA_EXECSTACK="
 	usr/bin/grub*-emu*
diff --git a/sys-boot/grub/grub-2.02_beta3-r1.ebuild b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
index bb291d118a771..d9554668de835 100644
--- a/sys-boot/grub/grub-2.02_beta3-r1.ebuild
+++ b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
@@ -115,7 +115,7 @@ RDEPEND+="
 DEPEND+=" !!=media-libs/freetype-2.5.4"
 
 STRIP_MASK="*/grub/*/*.{mod,img}"
-RESTRICT="test"
+RESTRICT="!test? ( test )"
 
 QA_EXECSTACK="
 	usr/bin/grub*-emu*
diff --git a/sys-boot/grub/grub-2.02_rc1.ebuild b/sys-boot/grub/grub-2.02_rc1.ebuild
index 7409bfd4ffeff..d2588046ba8cd 100644
--- a/sys-boot/grub/grub-2.02_rc1.ebuild
+++ b/sys-boot/grub/grub-2.02_rc1.ebuild
@@ -114,7 +114,7 @@ RDEPEND+="
 
 DEPEND+=" !!=media-libs/freetype-2.5.4"
 
-RESTRICT="strip test"
+RESTRICT="strip !test? ( test )"
 
 QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*"
 QA_WX_LOAD="usr/lib/grub/*"
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 8aeed5fc3425e..b56b7d26864bc 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -120,7 +120,7 @@ RDEPEND+="
 
 DEPEND+=" !!=media-libs/freetype-2.5.4"
 
-RESTRICT="strip test"
+RESTRICT="strip !test? ( test )"
 
 QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*"
 QA_WX_LOAD="usr/lib/grub/*"