diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 9a37d32f125..2c2b21b043b 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,7 +1,7 @@
 # Template file for 'openexr'
 pkgname=openexr
 version=3.1.5
-revision=1
+revision=2
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
@@ -11,14 +11,19 @@ maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
 changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
+distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>openexr-${version}.tar.gz"
 checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
-if [ "$XBPS_TARGET_WORDSIZE" = "32" ]
-then
-	make_check=no # Test Fails in i868
+if [ "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -DBUILD_TESTING=ON"
+else
+	configure_args+=" -DBUILD_TESTING=OFF"
+fi
+
+if [ "$XBPS_MACHINE" = "i686" ]; then
+	make_check=no # Test Fails in i686
 	# See upstream:
-	# https://github.com/AcademySoftwareFoundation/openexr/issues/876
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/1281
 fi
 
 post_install() {