diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix
index e2fbf55876fa..c168113fa3c4 100644
--- a/pkgs/development/libraries/gcc/libgcc/default.nix
+++ b/pkgs/development/libraries/gcc/libgcc/default.nix
@@ -90,7 +90,7 @@ in stdenv.mkDerivation (finalAttrs: {
         insn-constants.h \
   '' + lib.optionalString stdenv.targetPlatform.isM68k ''
         sysroot-suffix.h \
-  '' + lib.optionalString stdenv.targetPlatform.isArmv7 ''
+  '' + lib.optionalString stdenv.targetPlatform.isAarch32 ''
         arm-isa.h \
         arm-cpu.h \
   '' + ''
diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix
index d6fd8d3b1f80..ff83aedca123 100644
--- a/pkgs/test/cross/default.nix
+++ b/pkgs/test/cross/default.nix
@@ -135,6 +135,8 @@ let
     pkgs.pkgsLLVM.stdenv
     pkgs.pkgsStatic.bash
     pkgs.pkgsCross.arm-embedded.stdenv
+    pkgs.pkgsCross.sheevaplug.stdenv  # for armv5tel
+    pkgs.pkgsCross.raspberryPi.stdenv  # for armv6l
     pkgs.pkgsCross.armv7l-hf-multiplatform.stdenv
     pkgs.pkgsCross.m68k.stdenv
     pkgs.pkgsCross.aarch64-multiplatform.pkgsBuildTarget.gcc