diff --git a/meta/recipes-multimedia/libpng/files/0001-Makefile.am-drop-pngimage-full-from-TESTS.patch b/meta/recipes-multimedia/libpng/files/0001-Makefile.am-drop-pngimage-full-from-TESTS.patch
new file mode 100644
index 0000000000..61349abdaf
--- /dev/null
+++ b/meta/recipes-multimedia/libpng/files/0001-Makefile.am-drop-pngimage-full-from-TESTS.patch
@@ -0,0 +1,32 @@
+From 4e02adfe6fb14d4a9e78699a313981bd7c9f69f3 Mon Sep 17 00:00:00 2001
+From: Trevor Gamblin <tgamblin@baylibre.com>
+Date: Mon, 10 Aug 2026 13:58:35 -0400
+Subject: [PATCH] Makefile.am: drop pngimage-full from TESTS
+
+This test is prone to failure on riscv64. Remove it from the TESTS list so it
+doesn't get included in the test images.
+
+Upstream-Status: Inappropriate [oe-specific]
+
+Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
+---
+ Makefile.am | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index eb7078158..59051c2c7 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -109,8 +109,7 @@ TESTS =\
+    tests/pngunknown-sTER\
+    tests/pngunknown-save\
+    tests/pngunknown-vpAg\
+-   tests/pngimage-quick\
+-   tests/pngimage-full
++   tests/pngimage-quick
+ endif
+ 
+ # man pages
+-- 
+2.55.0
+
diff --git a/meta/recipes-multimedia/libpng/libpng_1.6.58.bb b/meta/recipes-multimedia/libpng/libpng_1.6.58.bb
index 6e4e5e9f38..02832640cc 100644
--- a/meta/recipes-multimedia/libpng/libpng_1.6.58.bb
+++ b/meta/recipes-multimedia/libpng/libpng_1.6.58.bb
@@ -13,6 +13,7 @@ LIBV = "16"
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}${LIBV}/${BP}.tar.xz \
            file://run-ptest \
 "
+SRC_URI:append:riscv64 = " file://0001-Makefile.am-drop-pngimage-full-from-TESTS.patch"
 
 SRC_URI[sha256sum] = "28eb403f51f0f7405249132cecfe82ea5c0ef97f1b32c5a65828814ae0d34775"