diff --git a/python.vim b/python.vim
index 53f1112..1dc68ad 100644
--- a/python.vim
+++ b/python.vim
@@ -220,7 +220,7 @@ syn match   pythonFloat		"\<\d\+[eE][+-]\=\d\+[jJ]\=\>" display
 syn match   pythonFloat		"\<\d\+\.\d*\([eE][+-]\=\d\+\)\=[jJ]\=" display
 
 syn match   pythonOctError	"\<0[oO]\=\o*[8-9]\d*[lL]\=\>" display
-syn match   pythonHexError	"\<0[xX]\x*\X\x*[lL]\=\>" display
+syn match   pythonHexError	"\<0[xX]\x*[g-zG-Z]\x*[lL]\=\>" display
 syn match   pythonBinError	"\<0[bB][01]*[2-9]\d*[lL]\=\>" display
 
 if exists("python_highlight_builtins") && python_highlight_builtins != 0
diff --git a/test.py b/test.py
index d807c15..44430ce 100644
--- a/test.py
+++ b/test.py
@@ -48,11 +48,11 @@ RuntimeWarning FutureWarning OverflowWarning ImportWarning UnicodeWarning
 
 # Numbers
 
-0 0x 0x1f 077 .3 12.34 100L 0j 0j 34.2E-3
+0 0x1f 077 .3 12.34 100L 0j 0j 34.2E-3 0b10 0o77
 
 # Erroneous numbers
 
-08 0xk
+08 0xk 0x  0b102 0o78
 
 # Strings