Index: build/test/tests/01-pkgconfig.tcl
==================================================================
--- build/test/tests/01-pkgconfig.tcl
+++ build/test/tests/01-pkgconfig.tcl
@@ -3,10 +3,18 @@
 # Tcl 8.4 doesn't support this test
 if {$tcl_version == "8.4"} {
 	exit 0
 }
 
-if {[tcl::pkgconfig get 64bit] == 0} {
+# Determine if we should be 64-bit or not
+set buildflags [split [lindex $argv 1] -]
+if {[lsearch -exact $buildflags "amd64"] != -1} {
+	set is64bit 1
+} else {
+	set is64bit 0
+}
+
+if {[tcl::pkgconfig get 64bit] == $is64bit} {
 	exit 0
 }
 
 exit 1