diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index 5edc85ac8319..ea122a265f0f 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -4075,12 +4075,7 @@ const InterfaceShimEntry kInterfaceShimMap[] =
   { "nsIDOMLoadStatus", "LoadStatus" },
   { "nsIDOMOfflineResourceList", "OfflineResourceList" },
   { "nsIDOMRange", "Range" },
-  { "nsIDOMSVGFETurbulenceElement", "SVGFETurbulenceElement" },
-  { "nsIDOMSVGFEMorphologyElement", "SVGFEMorphologyElement" },
-  { "nsIDOMSVGFEConvolveMatrixElement", "SVGFEConvolveMatrixElement" },
-  { "nsIDOMSVGFEDisplacementMapElement", "SVGFEDisplacementMapElement" },
   { "nsIDOMSVGLength", "SVGLength" },
-  { "nsIDOMSVGUnitTypes", "SVGUnitTypes" },
   { "nsIDOMNodeFilter", "NodeFilter" },
   { "nsIDOMXPathNamespace", "XPathNamespace" },
   { "nsIDOMXPathResult", "XPathResult" },
diff --git a/js/xpconnect/tests/mochitest/file_bug790732.html b/js/xpconnect/tests/mochitest/file_bug790732.html
index 5515dfc2027c..64ea3220851c 100644
--- a/js/xpconnect/tests/mochitest/file_bug790732.html
+++ b/js/xpconnect/tests/mochitest/file_bug790732.html
@@ -36,18 +36,19 @@ function testShim() {
   is(Ci.nsIDOMLoadStatus, LoadStatus);
   is(Ci.nsIDOMOfflineResourceList, OfflineResourceList);
   is(Ci.nsIDOMRange, Range);
-  is(Ci.nsIDOMSVGFETurbulenceElement, SVGFETurbulenceElement);
-  is(Ci.nsIDOMSVGFEMorphologyElement, SVGFEMorphologyElement);
-  is(Ci.nsIDOMSVGFEConvolveMatrixElement, SVGFEConvolveMatrixElement);
-  is(Ci.nsIDOMSVGFEDisplacementMapElement, SVGFEDisplacementMapElement);
   is(Ci.nsIDOMSVGLength, SVGLength);
-  is(Ci.nsIDOMSVGUnitTypes, SVGUnitTypes);
   is(Ci.nsIDOMNodeFilter, NodeFilter);
   is(Ci.nsIDOMXPathNamespace, XPathNamespace);
   is(Ci.nsIDOMXPathResult, XPathResult);
   is(Ci.nsIDOMXULButtonElement, XULButtonElement);
   is(Ci.nsIDOMXULCheckboxElement, XULCheckboxElement);
   is(Ci.nsIDOMXULPopupElement, XULPopupElement);
+
+  // Test for Bug 895231
+  for (var k of Object.keys(Components.interfaces)) {
+    ok(SpecialPowers.Ci.hasOwnProperty(k),
+       k + " should be removed from the Components shim");
+  }
 }
 </script>
 </head>