diff --git a/test/index.html b/test/index.html
index 83de1522a9..57d7f9eb76 100644
--- a/test/index.html
+++ b/test/index.html
@@ -33,8 +33,16 @@
      * by setting goog.UID_PROPERTY_ on the monitored window.  In order to test
      * that we don't have other global leaks, we preemptively set the property
      * so Mocha can compare the global before and after our tests.
+     *
+     * In addition, calling goog.events.listen on the global object (as done
+     * in deviceorientation.js) creates a second leak by setting
+     * goog.events.LISTENER_MAP_PROP_ on the global object.
+     *
+     * We preemptively set both of these properties so Mocha can compare the
+     * global before and after tests.  The call to goog.events.listen also
+     * calls goog.getUid.
      */
-    goog.getUid(this);
+    goog.events.listen(this, 'test', function() {});
 
     if (window.mochaPhantomJS) {
       mochaPhantomJS.run();