diff --git a/srcpkgs/coreutils/template b/srcpkgs/coreutils/template
index 82bbf307b5c..1725730e84a 100644
--- a/srcpkgs/coreutils/template
+++ b/srcpkgs/coreutils/template
@@ -1,26 +1,26 @@
 # Template file for 'coreutils'
 pkgname=coreutils
-version=8.30
+version=8.31
 revision=1
 bootstrap=yes
 makedepends="gmp-devel acl-devel libcap-devel"
-replaces="chroot-coreutils>=0 coreutils-doc>=0 b2sum>=0"
-short_desc="The GNU core utilities"
+short_desc="GNU core utilities"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/coreutils"
 changelog="https://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=blob_plain;f=NEWS;hb=HEAD"
 distfiles="${GNU_SITE}/coreutils/coreutils-${version}.tar.xz"
-checksum=e831b3a86091496cdba720411f9748de81507798f6130adeaef872d206e1b057
+checksum=ff7a9c918edce6b4f4b2725e3f9b37b0c4d193531cac49a48b56c4d0d3a9e9fd
+
+replaces="chroot-coreutils>=0 coreutils-doc>=0 b2sum>=0"
 
 if [ "$CHROOT_READY" ]; then
-	hostmakedepends="perl"
+	hostmakedepends+=" perl"
 fi
 
 alternatives="
  hostname:hostname:/usr/bin/hostname-coreutils
- hostname:hostname.1:/usr/share/man/man1/hostname-coreutils.1
-"
+ hostname:hostname.1:/usr/share/man/man1/hostname-coreutils.1"
 
 pre_configure() {
 	# Build natively all utils for the host, we need this to generate
@@ -59,6 +59,7 @@ do_configure() {
 		sed -i Makefile -e 's;^\(cu_install_program =\).*;\1 install;'
 	fi
 }
+
 do_build() {
 	if [ "$CROSS_BUILD" ]; then
 		cp Makefile Makefile.orig
@@ -78,29 +79,21 @@ do_build() {
 }
 
 do_check() {
+	local exeext_tests
+
 	# chgrp tests fail inside a chroot
 	sed -i '/tests\/chgrp/d' Makefile
 
-	exeext_tests="chown lchown canonizalize fchownat
-	 chdir calloc-gnu c-ctype byteswap bitrotate bind"
-	sh_tests="c-strcase btowc1 btowc2"
+	# Tests that fail due to being inside a chroot
+	exeext_tests="chown lchown fchownat"
 
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl)
-			# Disable locale tests that fail on musl
-			exeext_tests+=" localename getlogin getcwd"
-			sh_tests+=" mbrtowc5"
-			;;
-	esac
+	# Tests that depend on the tests reemoved
+	exeext_tests+=" fchmodat fchdir"
 
 	for test in $exeext_tests ; do
 		sed -i "/test-$test\$(EXEEXT)/d" gnulib-tests/Makefile
 	done
 
-	for test in $sh_tests ; do
-		sed -i "/test-$test.sh/d" gnulib-tests/Makefile
-	done
-
 	make check
 }