diff --git a/src/Cargo.lock b/src/Cargo.lock
index 8b76381a5861..09aefd45e94c 100644
--- a/src/Cargo.lock
+++ b/src/Cargo.lock
@@ -578,7 +578,6 @@ dependencies = [
  "rustc_const_math 0.0.0",
  "rustc_data_structures 0.0.0",
  "rustc_errors 0.0.0",
- "rustc_i128 0.0.0",
  "rustc_platform_intrinsics 0.0.0",
  "syntax 0.0.0",
  "syntax_pos 0.0.0",
diff --git a/src/librustc/ty/mod.rs b/src/librustc/ty/mod.rs
index 523c61d404f0..411e14531fab 100644
--- a/src/librustc/ty/mod.rs
+++ b/src/librustc/ty/mod.rs
@@ -71,8 +71,6 @@ pub use self::context::{Lift, TypeckTables};
 
 pub use self::trait_def::{TraitDef, TraitFlags};
 
-use rustc_i128::u128;
-
 pub mod adjustment;
 pub mod cast;
 pub mod error;
diff --git a/src/librustc_typeck/Cargo.toml b/src/librustc_typeck/Cargo.toml
index 067893552427..f08d26373e50 100644
--- a/src/librustc_typeck/Cargo.toml
+++ b/src/librustc_typeck/Cargo.toml
@@ -22,4 +22,3 @@ rustc_data_structures = { path = "../librustc_data_structures" }
 rustc_platform_intrinsics = { path = "../librustc_platform_intrinsics" }
 syntax_pos = { path = "../libsyntax_pos" }
 rustc_errors = { path = "../librustc_errors" }
-rustc_i128 = { path = "../librustc_i128" }
diff --git a/src/librustc_typeck/lib.rs b/src/librustc_typeck/lib.rs
index aa2695b9553e..f19a59a5d38a 100644
--- a/src/librustc_typeck/lib.rs
+++ b/src/librustc_typeck/lib.rs
@@ -98,8 +98,6 @@ extern crate rustc_const_eval;
 extern crate rustc_data_structures;
 extern crate rustc_errors as errors;
 
-extern crate rustc_i128;
-
 pub use rustc::dep_graph;
 pub use rustc::hir;
 pub use rustc::lint;
diff --git a/src/test/codegen/match.rs b/src/test/codegen/match.rs
index c35206e6e0a4..aa100da60132 100644
--- a/src/test/codegen/match.rs
+++ b/src/test/codegen/match.rs
@@ -21,7 +21,7 @@ pub enum E {
 #[no_mangle]
 pub fn exhaustive_match(e: E) {
 // CHECK: switch{{.*}}, label %[[OTHERWISE:[a-zA-Z0-9_]+]] [
-// CHECK-NEXT: i8 [[DISCR:[0-9]+]], label %[[TRUE:[a-zA-Z0-9_]+]]
+// CHECK-NEXT: i[[TY:[0-9]+]] [[DISCR:[0-9]+]], label %[[TRUE:[a-zA-Z0-9_]+]]
 // CHECK-NEXT: ]
 // CHECK: [[TRUE]]:
 // CHECK-NEXT: br label %[[EXIT:[a-zA-Z0-9_]+]]
diff --git a/src/test/mir-opt/simplify_if.rs b/src/test/mir-opt/simplify_if.rs
index 7239e32357b9..0e8971269b00 100644
--- a/src/test/mir-opt/simplify_if.rs
+++ b/src/test/mir-opt/simplify_if.rs
@@ -17,7 +17,7 @@ fn main() {
 // END RUST SOURCE
 // START rustc.node4.SimplifyBranches.initial-before.mir
 // bb0: {
-//     if(const false) -> [true: bb1, false: bb2];
+//     switchInt(const false) -> [0: bb2, otherwise: bb1];
 // }
 // END rustc.node4.SimplifyBranches.initial-before.mir
 // START rustc.node4.SimplifyBranches.initial-after.mir