diff --git a/dom/system/tests/marionette/test_proximity_change.js b/dom/system/tests/marionette/test_proximity_change.js
index b6b59808d318..5446fa9fc41e 100644
--- a/dom/system/tests/marionette/test_proximity_change.js
+++ b/dom/system/tests/marionette/test_proximity_change.js
@@ -54,6 +54,9 @@ function changeProximity() {
     is(event.value, expectedEvent.value, "value");
     is(event.min, expectedEvent.min, "min");
     is(event.max, expectedEvent.max, "max");
+    // Turn off event handler and listener
+    window.ondeviceproximity = null;
+    window.removeEventListener('deviceproximity', listener);
     restoreProximity();
   };
 
@@ -73,9 +76,6 @@ function restoreProximity() {
 }
 
 function cleanUp() {
-  // Turn proximity event listener and handler off
-  window.removeEventListener('deviceproximity', listener);
-  window.ondeviceproximity = null;
   finish();
 }