@@ -220,14 +220,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}"