diff --git a/hgext/keyword.py b/hgext/keyword.py
--- a/hgext/keyword.py
+++ b/hgext/keyword.py
@@ -88,8 +88,8 @@ import re, shutil, tempfile, time
 commands.optionalrepo += ' kwdemo'
 
 # hg commands that do not act on keywords
-nokwcommands = ('add addremove bundle copy export grep identify incoming init'
-                ' log outgoing push remove rename rollback tip'
+nokwcommands = ('add addremove bundle copy export grep incoming init'
+                ' log outgoing push rename rollback tip'
                 ' convert email glog')
 
 # hg commands that trigger expansion only when writing to working dir,
diff --git a/tests/test-keyword b/tests/test-keyword
--- a/tests/test-keyword
+++ b/tests/test-keyword
@@ -67,6 +67,7 @@ hg --debug commit -mabsym -d '0 0' -u 'U
 echo % status
 hg status
 echo % identify
+hg debugrebuildstate
 hg --quiet identify
 echo % cat
 cat a b
@@ -216,6 +217,7 @@ hg cat sym a b
 echo
 
 echo % remove
+hg debugrebuildstate
 hg remove a
 hg --debug commit -m rma
 echo % status