diff --git a/app-arch/unshield/unshield-1.4.2.recipe b/app-arch/unshield/unshield-1.4.2.recipe
index cc2888859..e102495a2 100644
--- a/app-arch/unshield/unshield-1.4.2.recipe
+++ b/app-arch/unshield/unshield-1.4.2.recipe
@@ -10,7 +10,7 @@ CHECKSUM_SHA256="5dd4ea0c7e97ad8e3677ff3a254b116df08a5d041c2df8859aad5c4f88d1f77
 SOURCE_FILENAME="unshield-$portVersion.tar.gz"
 PATCHES="unshield-$portVersion.patchset"
 
-ARCHITECTURES="!x86_gcc2 x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 libVersion="0.0.0"
@@ -49,11 +49,13 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-TEST_PREREQUIRES="
+TEST_REQUIRES="
+	cmd:curl
 	cmd:diff
 	cmd:find
+	cmd:unzip
+	cmd:xargs
 	"
-BUILD_PREREQUIRES+="$TEST_PREREQUIRES"
 
 BUILD()
 {
@@ -83,12 +85,9 @@ EOF
 	packageEntries devel "$developDir"
 }
 
-# Upstream modify their test suite quite frequently.
-# As test cases are fetched from the Internet,
-# they're only useful for people developing unshield,
-# because one would require the latest md5sums from
-# upstream for tests to pass
-#TEST()
-#{
-#	UNSHIELD="$PWD/src/unshield" ./run-tests.sh
-#}
+# The scripts called by run-tests.sh download a few files from the internet.
+# The total size is currently around 10 MB.
+TEST()
+{
+	LC_ALL=en_US UNSHIELD="$sourceDir"/src/unshield ./run-tests.sh
+}