@@ -1,8 +1,8 @@
 #! /bin/bash
 
-VERSIONS="8.5.15 8.6.1 cvs_HEAD"
+VERSIONS="8.5.15 8.6.2 cvs_HEAD"
 
 # Find the base directory
 for x in 1 2 3 4 __fail__; do
 	if [ "${x}" = "__fail__" ]; then
 		echo 'Unable to find KitCreator, aborting.' >&2
@@ -67,14 +67,14 @@
 	echo "$!"
 )"
 DISPLAY=:31
 export DISPLAY
 
-if [ "${BIGBUILD}" = "1" ]; then
-	kits="$(echo normal{,-zip,-nomk4}{,-threaded}{,-statictk,-notk} normal{,-threaded}{,-notk}{,-nomk4}{,-debug}-kitdll win32-i586{,-zip,-nomk4}{,-threaded}{,-notk} win32-i586{,-threaded}{,-notk}{,-nomk4}-kitdll min{,-static} {linux-mipsel-min}{,-debug}{,-kitdll} {linux-i386,solaris-i386,solaris-amd64,solaris-sparc,solaris-sparc64,freebsd-amd64,netbsd-amd64}{,-zip,-nomk4}{,-threaded}{,-statictk,-notk}{,debug} {solaris-i386,solaris-amd64,solaris-sparc,solaris-sparc64,freebsd-amd64,netbsd-amd64}{,-threaded}{,-notk}{,-nomk4}{,debug}-kitdll netbsd-i386{,-zip,-nomk4}{,-threaded}{,debug}-notk netbsd-i386{,-threaded}{,-nomk4}{,debug}-notk-kitdll android-arm-notk{,-debug} andoid-arm-notk{,-debug}-kitdll)"
+if [ -z "${KC_TEST_KITS}" ]; then
+	kits="linux-amd64 linux-amd64-zip linux-amd64-threaded linux-amd64-threaded-zip linux-amd64-statictk linux-amd64-notk linux-amd64-threaded-notk linux-amd64-threaded-zip-notk linux-amd64-nomk4 linux-amd64-debug min min-static linux-amd64-kitdll linux-amd64-threaded-kitdll linux-amd64-notk-kitdll linux-amd64-nomk4-kitdll linux-amd64-nomk4-notk-kitdll linux-amd64-threaded-nomk4-kitdll linux-amd64-threaded-notk-nomk4-kitdll linux-amd64-debug-kitdll min-kitdll win32-i586 win32-i586-zip win32-i586-threaded win32-i586-threaded-zip win32-i586-notk win32-i586-threaded-notk win32-i586-nomk4 win32-i586-kitdll win32-i586-threaded-kitdll win32-i586-notk-kitdll win32-i586-nomk4-kitdll win32-i586-nomk4-notk-kitdll win32-i586-threaded-nomk4-kitdll win32-i586-threaded-notk-nomk4-kitdll win64-amd64 win64-amd64-zip win64-amd64-threaded win64-amd64-threaded-zip win64-amd64-notk win64-amd64-threaded-notk win64-amd64-nomk4 win64-amd64-kitdll win64-amd64-threaded-kitdll win64-amd64-notk-kitdll win64-amd64-nomk4-kitdll win64-amd64-nomk4-notk-kitdll win64-amd64-threaded-nomk4-kitdll win64-amd64-threaded-notk-nomk4-kitdll linux-mipsel-notk linux-mipsel-notk-kitdll linux-i386 linux-i386-debug linux-i386-kitdll linux-i386-debug-kitdll linux-i386-notk linux-i386-notk-debug linux-i386-notk-kitdll linux-i386-notk-debug-kitdll solaris-i386 solaris-i386-debug solaris-i386-kitdll solaris-i386-debug-kitdll solaris-amd64 solaris-amd64-debug solaris-amd64-kitdll solaris-amd64-debug-kitdll solaris-sparc solaris-sparc-debug solaris-sparc-kitdll solaris-sparc-debug-kitdll solaris-sparc64 solaris-sparc64-debug solaris-sparc64-kitdll solaris-sparc64-debug-kitdll freebsd-amd64 freebsd-amd64-debug freebsd-amd64-kitdll freebsd-amd64-debug-kitdll netbsd-i386-notk netbsd-i386-notk-debug netbsd-i386-notk-kitdll netbsd-i386-notk-debug-kitdll netbsd-amd64 netbsd-amd64-debug netbsd-amd64-kitdll netbsd-amd64-debug-kitdll android-arm-notk android-arm-notk-debug android-arm-notk-kitdll android-arm-notk-debug-kitdll"
 else
-	kits="normal normal-zip normal-threaded normal-threaded-zip normal-statictk normal-notk normal-threaded-notk normal-threaded-zip-notk normal-nomk4 normal-debug min min-static normal-kitdll normal-threaded-kitdll normal-notk-kitdll normal-nomk4-kitdll normal-nomk4-notk-kitdll normal-threaded-nomk4-kitdll normal-threaded-notk-nomk4-kitdll normal-debug-kitdll min-kitdll win32-i586 win32-i586-zip win32-i586-threaded win32-i586-threaded-zip win32-i586-notk win32-i586-threaded-notk win32-i586-nomk4 win32-i586-kitdll win32-i586-threaded-kitdll win32-i586-notk-kitdll win32-i586-nomk4-kitdll win32-i586-nomk4-notk-kitdll win32-i586-threaded-nomk4-kitdll win32-i586-threaded-notk-nomk4-kitdll win64-amd64 win64-amd64-zip win64-amd64-threaded win64-amd64-threaded-zip win64-amd64-notk win64-amd64-threaded-notk win64-amd64-nomk4 win64-amd64-kitdll win64-amd64-threaded-kitdll win64-amd64-notk-kitdll win64-amd64-nomk4-kitdll win64-amd64-nomk4-notk-kitdll win64-amd64-threaded-nomk4-kitdll win64-amd64-threaded-notk-nomk4-kitdll linux-mipsel-notk linux-mipsel-notk-kitdll linux-i386 linux-i386-debug linux-i386-kitdll linux-i386-debug-kitdll linux-i386-notk linux-i386-notk-debug linux-i386-notk-kitdll linux-i386-notk-debug-kitdll solaris-i386 solaris-i386-debug solaris-i386-kitdll solaris-i386-debug-kitdll solaris-amd64 solaris-amd64-debug solaris-amd64-kitdll solaris-amd64-debug-kitdll solaris-sparc solaris-sparc-debug solaris-sparc-kitdll solaris-sparc-debug-kitdll solaris-sparc64 solaris-sparc64-debug solaris-sparc64-kitdll solaris-sparc64-debug-kitdll freebsd-amd64 freebsd-amd64-debug freebsd-amd64-kitdll freebsd-amd64-debug-kitdll netbsd-i386-notk netbsd-i386-notk-debug netbsd-i386-notk-kitdll netbsd-i386-notk-debug-kitdll netbsd-amd64 netbsd-amd64-debug netbsd-amd64-kitdll netbsd-amd64-debug-kitdll android-arm-notk android-arm-notk-debug android-arm-notk-kitdll android-arm-notk-debug-kitdll"
+	kits="${KC_TEST_KITS}"
 fi
 
 failed=""
 for kit in $kits; do
 	kitcreator="./kitcreator"
@@ -112,11 +112,11 @@
 			xcompile="1"
 			runnable="1"
 			kitruncmd="wine"
 			;;
 		win64|win64-*)
-			kitcreator="./build/make-kit-win32"
+			kitcreator="./build/make-kit-win64"
 			xcompile="1"
 			runnable="1"
 			kitruncmd="wine64"
 			;;
 		linux-mipsel-min|linux-mipsel-min-kitdll)
@@ -123,18 +123,23 @@
 			kitcreator="./build/make-kit-linux-mipsel"
 			runnable="0"
 			xcompile="1"
 			notk="1"
 			iszip="1"
+			;;
+		linux-amd64|linux-amd64-*)
+			kitcreator="./build/make-kit-linux-amd64"
+			xcompile="0"
+			runnable="1"
 			;;
 		linux-i386|linux-i386-*)
 			kitcreator="./build/make-kit-linux-i386"
 			xcompile="1"
+			runnable="0"
 			;;
 		android-arm|android-arm-*|\
 		linux-mipsel|linux-mipsel-*|\
-		linux-amd64|linux-amd64-*|\
 		solaris-i386|solaris-i386-*|\
 		solaris-amd64|solaris-amd64-*|\
 		solaris-sparc|solaris-sparc-*|\
 		solaris-sparc64|solaris-sparc64-*|\
 		freebsd-amd64|freebsd-amd64-*|\
@@ -219,14 +224,16 @@
 		iszip="0"
 	fi
 
 	for version in ${VERSIONS}; do
 		# Work around changes in default behaviour
-		if [ "${version}" = "cvs_HEAD" ]; then
-			kit="$(echo "${kit}" | sed 's@-threaded@-unthreaded@')"
-			args="$(echo "${args}" | sed 's@ --enable-threads@ --disable-threads@')"
-		fi
+		case "${version}" in
+			8.6.*|cvs_HEAD)
+				kit="$(echo "${kit}" | sed 's@-threaded@-unthreaded@')"
+				args="$(echo "${args}" | sed 's@ --enable-threads@ --disable-threads@')"
+				;;
+		esac
 
 		# Create Tclkit
 		if [ "${kitdll}" = "1" ]; then
 			createdkit="libtclkit*.dll libtclkit*.*"
 			outputname="${TESTDIR}/kits/libtclkit-${version}-${kit}"