diff --git a/ChangeLog b/ChangeLog
index 58d17e5d1..3d6bd4ba2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-12-09 Peter Stephenson
+
+ * 40138: Test/D07multibyte.ztst: Put the regex test last as it
+ has an additional dependency, and note this in a failure
+ message.
+
2016-12-09 Daniel Shahaf
* 40126: Functions/Misc/zed: zed (fned): When editing a new
diff --git a/Test/D07multibyte.ztst b/Test/D07multibyte.ztst
index 3a6e95543..cdc070e87 100644
--- a/Test/D07multibyte.ztst
+++ b/Test/D07multibyte.ztst
@@ -500,18 +500,6 @@
# aren't quite double width, but the arithmetic is correct.
# It appears just to be an effect of the font.
- if zmodload zsh/regex 2>/dev/null; then
- [[ $'\ua0' =~ '^.$' ]] && print OK
- [[ $'\ua0' =~ $'^\ua0$' ]] && print OK
- [[ $'\ua0'X =~ '^X$' ]] || print OK
- else
- ZTST_skip="regexp library not found."
- fi
-0:Ensure no confusion on metafied input to regex module
->OK
->OK
->OK
-
() {
emulate -L zsh
setopt errreturn
@@ -583,3 +571,19 @@
printf '%q%q\n' 你你
0:printf %q and quotestring and general metafy / token madness
>你你
+
+# This test is kept last as it introduces an additional
+# dependency on the system regex library.
+ if zmodload zsh/regex 2>/dev/null; then
+ [[ $'\ua0' =~ '^.$' ]] && print OK
+ [[ $'\ua0' =~ $'^\ua0$' ]] && print OK
+ [[ $'\ua0'X =~ '^X$' ]] || print OK
+ else
+ ZTST_skip="regexp library not found."
+ fi
+0:Ensure no confusion on metafied input to regex module
+>OK
+>OK
+>OK
+F:A failure here may indicate the system regex library does not
+F:support character sets outside the portable 7-bit range.