diff --git a/package/spidev_test/Config.in b/package/spidev_test/Config.in
index aa57b5edbf..81386adf7a 100644
--- a/package/spidev_test/Config.in
+++ b/package/spidev_test/Config.in
@@ -9,8 +9,8 @@ config BR2_PACKAGE_SPIDEV_TEST
 	  proper operation of 'spidev_test'.
 
 	  The version used is based on your toolchain headers version,
-	  if it's older than 3.15 then 3.0 is used, otherwise 4.10
-	  is used.
+	  if it's older than 3.15 then 3.0 is used, up to headers 4.20
+	  version 4.10 is used and otherwise version 5.8.
 	  This means you won't have quad-pumped SPI support if your
 	  toolchain is too old.
 
diff --git a/package/spidev_test/spidev_test.hash b/package/spidev_test/spidev_test.hash
index 7bc4a27e45..867920fc78 100644
--- a/package/spidev_test/spidev_test.hash
+++ b/package/spidev_test/spidev_test.hash
@@ -1,3 +1,4 @@
 # Locally calculated
-sha256 80471c330d8c0bf5ba6479c434a54a54bdd2dc59a703b9c76c2541ec04cfb8c3  spidev_test.c?id=v3.0
-sha256 3cf76b15d9a8644f3f5cbc0387cc02a7d4a392ade39788cbc6367cce98552e2f  spidev_test.c?id=v4.10
+sha256  80471c330d8c0bf5ba6479c434a54a54bdd2dc59a703b9c76c2541ec04cfb8c3  spidev_test.c?id=v3.0
+sha256  3cf76b15d9a8644f3f5cbc0387cc02a7d4a392ade39788cbc6367cce98552e2f  spidev_test.c?id=v4.10
+sha256  87329094ea3010eae9e65ad7ea2d2309e044845942414aa0ca8f1a7095b80178  spidev_test.c?id=v5.8
diff --git a/package/spidev_test/spidev_test.mk b/package/spidev_test/spidev_test.mk
index bd2fcf6db3..6c5a9495a4 100644
--- a/package/spidev_test/spidev_test.mk
+++ b/package/spidev_test/spidev_test.mk
@@ -10,7 +10,10 @@
 # If you need quad-pumped spi support you need to upgrade your toolchain.
 # Note that the location of spidev_test.c changes from v4.5 onwards.
 
-ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15),y)
+ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0),y)
+SPIDEV_TEST_VERSION = 5.8
+SPIDEV_TEST_PATH = tools/spi
+else ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15),y)
 SPIDEV_TEST_VERSION = 4.10
 SPIDEV_TEST_PATH = tools/spi
 else