diff --git a/dom/interfaces/geolocation/nsIDOMGeoGeolocation.idl b/dom/interfaces/geolocation/nsIDOMGeoGeolocation.idl
index 13d28be677b5..9f4114b5edc0 100644
--- a/dom/interfaces/geolocation/nsIDOMGeoGeolocation.idl
+++ b/dom/interfaces/geolocation/nsIDOMGeoGeolocation.idl
@@ -20,7 +20,7 @@ dictionary GeoPositionOptions
 
 [ptr] native NamespacedGeoPositionOptions(mozilla::idl::GeoPositionOptions);
 
-[scriptable, builtinclass, uuid(1bc7d103-c7ae-4467-881c-21a8dfa17938)]
+[builtinclass, uuid(1bc7d103-c7ae-4467-881c-21a8dfa17938)]
 interface nsIDOMGeoGeolocation : nsISupports
 {
   int32_t watchPosition(in nsIDOMGeoPositionCallback callback,
diff --git a/dom/tests/mochitest/chrome/test_geolocation.xul b/dom/tests/mochitest/chrome/test_geolocation.xul
index 13178310081a..bb4d5e6ddc82 100644
--- a/dom/tests/mochitest/chrome/test_geolocation.xul
+++ b/dom/tests/mochitest/chrome/test_geolocation.xul
@@ -15,7 +15,7 @@ SimpleTest.waitForExplicitFinish();
 const Ci = Components.interfaces;
 const Cc = Components.classes;
 
-var geolocation = Cc["@mozilla.org/geolocation;1"].getService(Ci.nsIDOMGeoGeolocation);
+var geolocation = Cc["@mozilla.org/geolocation;1"].getService(Ci.nsISupports);
 geolocation.getCurrentPosition(done, error);
 
 function error(error)
diff --git a/dom/tests/unit/test_geo_provider_accuracy.js b/dom/tests/unit/test_geo_provider_accuracy.js
index 068ec3c58c6e..60e694f622a7 100644
--- a/dom/tests/unit/test_geo_provider_accuracy.js
+++ b/dom/tests/unit/test_geo_provider_accuracy.js
@@ -68,7 +68,7 @@ function run_test()
     prefs.setBoolPref("geo.wifi.scan", false);
   }
 
-  geolocation = Cc["@mozilla.org/geolocation;1"].createInstance(Ci.nsIDOMGeoGeolocation);
+  geolocation = Cc["@mozilla.org/geolocation;1"].createInstance(Ci.nsISupports);
   geolocation.getCurrentPosition(function() {
     geolocation.getCurrentPosition(function() {
       if (runningInParent) {
diff --git a/dom/tests/unit/test_geolocation_provider.js b/dom/tests/unit/test_geolocation_provider.js
index 4dc16685b1a5..28853c8f52c1 100644
--- a/dom/tests/unit/test_geolocation_provider.js
+++ b/dom/tests/unit/test_geolocation_provider.js
@@ -81,6 +81,6 @@ function run_test()
     obs = obs.QueryInterface(Ci.nsIObserverService);
     obs.addObserver(observer, "geolocation-device-events", false);
 
-    geolocation = Cc["@mozilla.org/geolocation;1"].getService(Ci.nsIDOMGeoGeolocation);
+    geolocation = Cc["@mozilla.org/geolocation;1"].getService(Ci.nsISupports);
     watchID = geolocation.watchPosition(successCallback, errorCallback);
 }
diff --git a/dom/tests/unit/test_geolocation_timeout.js b/dom/tests/unit/test_geolocation_timeout.js
index 4f9c08b91b57..df84c9d3cb9c 100644
--- a/dom/tests/unit/test_geolocation_timeout.js
+++ b/dom/tests/unit/test_geolocation_timeout.js
@@ -57,6 +57,6 @@ function run_test()
     prefs.setBoolPref("geo.testing.ignore_ipc_principal", true);
   }
 
-  geolocation = Cc["@mozilla.org/geolocation;1"].getService(Ci.nsIDOMGeoGeolocation);
+  geolocation = Cc["@mozilla.org/geolocation;1"].getService(Ci.nsISupports);
   geolocation.getCurrentPosition(successCallback, errorCallback, {timeout: 2000});
 }
diff --git a/dom/tests/unit/test_multiple_geo_listeners.js b/dom/tests/unit/test_multiple_geo_listeners.js
index 9d0cd5648919..748107089b82 100644
--- a/dom/tests/unit/test_multiple_geo_listeners.js
+++ b/dom/tests/unit/test_multiple_geo_listeners.js
@@ -50,13 +50,13 @@ function run_test()
   }
 
   let timesCalled = 0;
-  geolocation = Cc["@mozilla.org/geolocation;1"].createInstance(Ci.nsIDOMGeoGeolocation);
+  geolocation = Cc["@mozilla.org/geolocation;1"].createInstance(Ci.nsISupports);
   geolocation.watchPosition(function(pos) {
     do_check_eq(++timesCalled, 1);
     do_check_eq(pos.coords.accuracy, gAccuracy);
 
     gAccuracy = 420;
-    geolocation2 = Cc["@mozilla.org/geolocation;1"].createInstance(Ci.nsIDOMGeoGeolocation);
+    geolocation2 = Cc["@mozilla.org/geolocation;1"].createInstance(Ci.nsISupports);
     geolocation2.getCurrentPosition(function(pos) {
       do_check_eq(pos.coords.accuracy, gAccuracy);