Index: build/test/test
==================================================================
--- build/test/test
+++ build/test/test
@@ -148,11 +148,11 @@
 			iszip="0"
 
 			;;
 	esac
 
-	if echo "${kit}" | egrep -- '-(hppa64|amd64|sparc64)-' >/dev/null; then
+	if echo "${kit}" | egrep -- '-(hppa64|amd64|sparc64)(-|$)' >/dev/null; then
 		args="${args} --enable-64bit"
 	fi
 
 	case "${kitruncmd}" in
 		wine)

Index: build/test/tests/01-pkgconfig.tcl
==================================================================
--- build/test/tests/01-pkgconfig.tcl
+++ build/test/tests/01-pkgconfig.tcl
@@ -15,8 +15,8 @@
 
 if {[tcl::pkgconfig get 64bit] == $is64bit} {
 	exit 0
 }
 
-puts "tcl::pkgconfig get returned [tcl::pkgconfig get 64bit], but we platform 64 bit returned: $is64bit"
+puts "tcl::pkgconfig get 64 returned [tcl::pkgconfig get 64bit], but platform is 64 bit returned: $is64bit"
 
 exit 1