Keyboard speed pull

These are the two commits from @davehunt's pull #1131 (fix issue #1130) that affect only tests that use the keyboard and not the whole suite.