diff --git a/ChangeLog b/ChangeLog
index 25fb77933..524f54242 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2013-10-10 Peter Stephenson
+ * 31810: Test/E02xtrace.ztst: tests for simple cases of XTRACE
+ output for conditions.
+
* 31809: Src/exec.c: make whitespace clear in trace output for
patterns.
diff --git a/Test/E02xtrace.ztst b/Test/E02xtrace.ztst
index 2420aebd7..093a587bd 100644
--- a/Test/E02xtrace.ztst
+++ b/Test/E02xtrace.ztst
@@ -118,3 +118,12 @@
?+./fnfile:5> :
?+./fnfile:6> fn
?+./fnfile:3> print This is fn.
+
+ set -x
+ [[ 'f o' = 'f x'* || 'b r' != 'z o' && 'squashy sound' < 'squishy sound' ]]
+ [[ -e nonexistentfile || ( -z '' && -t 3 ) ]]
+ set +x
+0:Trace for conditions
+?+(eval):2> [[ 'f o' == f\ x* || 'b r' != z\ o && 'squashy sound' < 'squishy sound' ]]
+?+(eval):3> [[ -e nonexistentfile || -z '' && -t 3 ]]
+?+(eval):4> set +x