diff --git a/test/keyboard-navigation.html b/test/keyboard-navigation.html
index cdf935b6e..230665cc1 100644
--- a/test/keyboard-navigation.html
+++ b/test/keyboard-navigation.html
@@ -1912,14 +1912,13 @@
           right();
 
           const spy = sinon.spy();
-          function callback(e) {
+
+          grid.addEventListener('cell-focus', (e) => {
             spy();
             const context = e.target.getEventContext(e);
             expect(context).to.deep.equal(expectedContext);
-            grid.removeEventListener('cell-focus', callback);
             done();
-          }
-          grid.addEventListener('cell-focus', callback);
+          });
 
           left();