diff --git a/tests/scripts/testjbigi.sh b/tests/scripts/testjbigi.sh
index 9949cef7a349ee684efd3e9330cffc6d6933c188..db0a2124696938cd48e189dc366ce2c451c210e1 100755
--- a/tests/scripts/testjbigi.sh
+++ b/tests/scripts/testjbigi.sh
@@ -13,6 +13,22 @@ cd `dirname $0`/../../installer/lib/jbigi
 
 TMP=/tmp/testjbigi$$
 mkdir $TMP
+
+echo "Testing 32 bit libcpuid ..."
+ln -s $PWD/libjcpuid-x86-linux.so $TMP/libjcpuid.so
+java -cp ../../../build/i2p.jar -Djava.library.path=$TMP freenet.support.CPUInformation.CPUID
+rm -f $TMP/libjcpuid.so
+echo
+
+echo "Testing 64 bit libcpuid ..."
+ln -s $PWD/libjcpuid-x86_64-linux.so $TMP/libjcpuid.so
+java -cp ../../../build/i2p.jar -Djava.library.path=$TMP freenet.support.CPUInformation.CPUID
+rm -f $TMP/libjcpuid.so
+echo
+
+
+
+
 for i in libjbigi-linux-*.so
 do
 	echo "Testing $i ..."
@@ -24,7 +40,7 @@ do
 		echo "********* FAILED CHECK FOR $i *************"
 		FAIL=1
 	fi
-	rm $TMP/libjbigi.so
+	rm -f $TMP/libjbigi.so
 	echo
 done