diff --git a/src/com/google/javascript/jscomp/RemoveSuperMethodsPass.java b/src/com/google/javascript/jscomp/RemoveSuperMethodsPass.java
index 1069a8e12ee..638a06cab59 100644
--- a/src/com/google/javascript/jscomp/RemoveSuperMethodsPass.java
+++ b/src/com/google/javascript/jscomp/RemoveSuperMethodsPass.java
@@ -16,9 +16,9 @@
 package com.google.javascript.jscomp;
 
 import com.google.javascript.jscomp.NodeTraversal.AbstractPostOrderCallback;
+import com.google.javascript.rhino.FunctionTypeI;
 import com.google.javascript.rhino.Node;
-import com.google.javascript.rhino.jstype.FunctionType;
-import com.google.javascript.rhino.jstype.JSType;
+import com.google.javascript.rhino.TypeI;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -127,17 +127,17 @@ private boolean functionNameMatches(String enclosingMethodName, Node call) {
 
       // Check that call references the superclass
       String calledClass = callNameSplittedByPrototypeMarker[0];
-      JSType subclassType = compiler.getTypeIRegistry().getType(enclosingClassName);
-      JSType calledClassType = compiler.getTypeIRegistry().getType(calledClass);
+      TypeI subclassType = compiler.getTypeIRegistry().getType(enclosingClassName);
+      TypeI calledClassType = compiler.getTypeIRegistry().getType(calledClass);
       if (subclassType == null || calledClassType == null) {
         return false;
       }
-      if (subclassType.toObjectType() == null
-          || subclassType.toObjectType().getConstructor() == null) {
+      if (subclassType.toMaybeObjectType() == null
+          || subclassType.toMaybeObjectType().getConstructor() == null) {
         return false;
       }
-      FunctionType superClassConstructor =
-          subclassType.toObjectType().getConstructor().getSuperClassConstructor();
+      FunctionTypeI superClassConstructor =
+          subclassType.toMaybeObjectType().getSuperClassConstructor();
       // TODO(moz): Investigate why this could be null
       if (superClassConstructor == null) {
         return false;
@@ -147,13 +147,13 @@ private boolean functionNameMatches(String enclosingMethodName, Node call) {
 
     private boolean returnMatches(Node call) {
       // no match if function being called does not have function type
-      JSType childType = call.getFirstChild().getJSType();
+      TypeI childType = call.getFirstChild().getTypeI();
       if (childType == null || !childType.isFunctionType()) {
         return false;
       }
       // no match if function being called has a return value, but result of the call is not part
       // of return statement
-      JSType returnType = childType.toMaybeFunctionType().getReturnType();
+      TypeI returnType = childType.toMaybeFunctionType().getReturnType();
       if (returnType != null && !returnType.isVoidType() && !returnType.isUnknownType()) {
         return call.getParent().isReturn();
       }
diff --git a/test/com/google/javascript/jscomp/RemoveSuperMethodsPassTest.java b/test/com/google/javascript/jscomp/RemoveSuperMethodsPassTest.java
index 847e2508001..ee7a603c9ef 100644
--- a/test/com/google/javascript/jscomp/RemoveSuperMethodsPassTest.java
+++ b/test/com/google/javascript/jscomp/RemoveSuperMethodsPassTest.java
@@ -18,7 +18,7 @@
 import com.google.common.collect.ImmutableList;
 
 /** Tests for {@link RemoveSuperMethodsPass} */
-public final class RemoveSuperMethodsPassTest extends CompilerTestCase {
+public final class RemoveSuperMethodsPassTest extends TypeICompilerTestCase {
 
   private static final String BOILERPLATE =
       LINE_JOINER.join(
@@ -37,7 +37,7 @@ public final class RemoveSuperMethodsPassTest extends CompilerTestCase {
           "/** @constructor @extends {FooBase} */",
           "var Foo = function() {}",
           "Foo.superClass_ = FooBase.prototype",
-          "var ns = {};",
+          "/** @const */ var ns = {};",
           "/** @constructor */ ns.FooBase = function() {};",
           "ns.FooBase.prototype.bar = function() {};",
           "/** @constructor @extends {ns.FooBase} */ ns.Foo = function() {};",
@@ -45,7 +45,6 @@ public final class RemoveSuperMethodsPassTest extends CompilerTestCase {
 
   public RemoveSuperMethodsPassTest() {
     super(DEFAULT_EXTERNS);
-    enableTypeCheck();
   }
 
   @Override
@@ -68,7 +67,7 @@ public void testOptimize_noArgs() {
             "Foo.prototype.bar = function() { Foo.superClass_.bar.call(this); };"));
   }
 
-  public void testOptimize_baseClassName_noArgs() {
+  public void testOptimize_noArgs_baseClassName() {
     testOptimize(
         LINE_JOINER.join(
             "/** @override */",
@@ -160,13 +159,15 @@ public void testNoOptimize_methodNameMismatch() {
     testNoOptimize(
         LINE_JOINER.join(
             "Foo.prototype.baw = {",
-            "  superClass_: { baz: /** @return {number} */ function(time, loc) {} }",
+            "  superClass_: { baz: /** @return {number} */ function(time, loc) { return 3; } }",
             "};",
             "/** @override */",
             "Foo.prototype.baz = function(time, loc) {",
             "  return Foo.prototype.baw.superClass_.baz.call(this, time, loc);",
             "};"));
 
+    ignoreWarnings(
+        NewTypeInference.INEXISTENT_PROPERTY, NewTypeInference.UNKNOWN_NAMESPACE_PROPERTY);
     testNoOptimize(
         LINE_JOINER.join(
             "Foo.prototype.baw = {};",
@@ -201,6 +202,7 @@ public void testNoOptimize_moreThanOneStatement() {
   }
 
   public void testNoOptimize_missingReturn() {
+    ignoreWarnings(NewTypeInference.MISSING_RETURN_STATEMENT);
     testNoOptimize(
         LINE_JOINER.join(
             "/** @override */",