diff --git a/src/testdir/test_messages.vim b/src/testdir/test_messages.vim
index 9c731ca..8a7d055 100644
--- a/src/testdir/test_messages.vim
+++ b/src/testdir/test_messages.vim
@@ -387,7 +387,9 @@
   call delete('b.txt')
 endfunc
 
-func Test_cmdheight_zero()
+" FIXME: running this last as it seems to cause
+" Test_mapping_at_hit_return_prompt() to faile
+func Test_x_cmdheight_zero()
   enew
   set cmdheight=0
   set showcmd