diff --git a/src/testdir/test64.in b/src/testdir/test64.in
index 37f263b..9799647 100644
--- a/src/testdir/test64.in
+++ b/src/testdir/test64.in
@@ -262,10 +262,6 @@
 :call add(tl, ['[a-zA-Z]', 'a', 'a'])
 :call add(tl, ['[A-Z]', 'a'])
 :call add(tl, ['\C[^A-Z]\+', 'ABCOIJDEOIFNSD jsfoij sa', ' jsfoij sa'])
-:call add(tl, ['\i\+', '&*§xx ', 'xx'])
-:call add(tl, ['\%#=1\i\+', '&*§xx ', 'xx'])
-:call add(tl, ['\f\+', '&*fname ', 'fname'])
-:call add(tl, ['\%#=1\i\+', '&*fname ', 'fname'])
 
 :"""" Tests for \z features
 :call add(tl, ['xx \ze test', 'xx '])					" must match after \ze
@@ -290,13 +286,18 @@
 
 :"""" Combining different tests and features
 :call add(tl, ['[[:alpha:]]\{-2,6}', '787abcdiuhsasiuhb4', 'ab'])
-:call add(tl, ['[^[=a=]]\+', 'ddaãâbcd', 'dd'])
 :call add(tl, ['', 'abcd', ''])
 :call add(tl, ['\v(())', 'any possible text', ''])
 :call add(tl, ['\v%(ab(xyz)c)', '   abxyzc ', 'abxyzc', 'xyz'])
 :call add(tl, ['\v(test|)empty', 'tesempty', 'empty', ''])
 :call add(tl, ['\v(a|aa)(a|aa)', 'aaa', 'aa', 'a', 'a'])
 
+:"""" \%u and friends
+:call add(tl, ['\%d32', 'yes no', ' '])
+:call add(tl, ['\%o40', 'yes no', ' '])
+:call add(tl, ['\%x20', 'yes no', ' '])
+:call add(tl, ['\%u0020', 'yes no', ' '])
+:call add(tl, ['\%U00000020', 'yes no', ' '])
 
 :"""" Run the tests
 
diff --git a/src/testdir/test64.ok b/src/testdir/test64.ok
index e3f5657..d31f1ef 100644
--- a/src/testdir/test64.ok
+++ b/src/testdir/test64.ok
@@ -203,10 +203,6 @@
 OK - [a-zA-Z]
 OK - [A-Z]
 OK - \C[^A-Z]\+
-OK - \i\+
-OK - \%#=1\i\+
-OK - \f\+
-OK - \%#=1\i\+
 OK - xx \ze test
 OK - abc\zeend
 OK - abc\zsdd
@@ -225,10 +221,14 @@
 OK - .*John\&.*Bob
 OK - \v(test1)@=.*yep
 OK - [[:alpha:]]\{-2,6}
-OK - [^[=a=]]\+
 OK - 
 OK - \v(())
 OK - \v%(ab(xyz)c)
 OK - \v(test|)empty
 OK - \v(a|aa)(a|aa)
+OK - \%d32
+OK - \%o40
+OK - \%x20
+OK - \%u0020
+OK - \%U00000020
 192.168.0.1
diff --git a/src/testdir/test95.in b/src/testdir/test95.in
index ed90bb7..7185c8e 100644
--- a/src/testdir/test95.in
+++ b/src/testdir/test95.in
@@ -7,7 +7,7 @@
 STARTTEST
 :so small.vim
 :so mbyte.vim
-:set encoding=utf-8 viminfo+=nviminfo
+:set nocp encoding=utf-8 viminfo+=nviminfo
 :" tl is a List of Lists with:
 :"    regexp pattern
 :"    text to test the pattern on
@@ -29,6 +29,15 @@
 :" this is not a normal "i" but 0xec
 :call add(tl, ['\p\+', 'ìa', 'ìa'])
 
+:"""" Test recognition of some character classes
+:call add(tl, ['\i\+', '&*§xx ', 'xx'])
+:call add(tl, ['\%#=1\i\+', '&*§xx ', 'xx'])
+:call add(tl, ['\f\+', '&*fname ', 'fname'])
+:call add(tl, ['\%#=1\i\+', '&*fname ', 'fname'])
+
+:"""" Combining different tests and features
+:call add(tl, ['[^[=a=]]\+', 'ddaãâbcd', 'dd'])
+
 :"""" Run the tests
 
 :"
diff --git a/src/testdir/test95.ok b/src/testdir/test95.ok
index cb1577a..4a91073 100644
--- a/src/testdir/test95.ok
+++ b/src/testdir/test95.ok
@@ -5,3 +5,8 @@
 OK -  [^ ]\+
 OK - [ม[:alpha:][=a=]]\+
 OK - \p\+
+OK - \i\+
+OK - \%#=1\i\+
+OK - \f\+
+OK - \%#=1\i\+
+OK - [^[=a=]]\+