diff --git a/llvm/test/BugPoint/attr-crash.ll b/llvm/test/BugPoint/attr-crash.ll
index 08e43808ec50..c79671a00dba 100644
--- a/llvm/test/BugPoint/attr-crash.ll
+++ b/llvm/test/BugPoint/attr-crash.ll
@@ -8,7 +8,7 @@ target triple = "x86_64-unknown-linux-gnu"
 
 
 ; Function Attrs: noinline nounwind optnone uwtable
-define dso_local i32 @main(i32 %argc, i8** %argv) local_unnamed_addr #0 {
+define dso_local i32 @main(i32 %argc, ptr %argv) local_unnamed_addr #0 {
   ret i32 0
 }
 
diff --git a/llvm/test/BugPoint/metadata.ll b/llvm/test/BugPoint/metadata.ll
index b5a1e7377000..b1fb6c011041 100644
--- a/llvm/test/BugPoint/metadata.ll
+++ b/llvm/test/BugPoint/metadata.ll
@@ -19,11 +19,11 @@
 ; NOTYPE-NOT: !DIBasicType
 
 %rust_task = type {}
-define void @test(i32* %a, i8* %b) !dbg !9 {
+define void @test(ptr %a, ptr %b) !dbg !9 {
     %s = mul i8 22, 9, !attach !0, !dbg !10
-    store i8 %s, i8* %b, !attach !1, !dbg !11
+    store i8 %s, ptr %b, !attach !1, !dbg !11
     call void @foo(), !attach !2, !dbg !12
-    store i32 7, i32* %a, !attach !3, !dbg !13
+    store i32 7, ptr %a, !attach !3, !dbg !13
     %t = add i32 0, 5, !attach !4, !dbg !14
     ret void
 }
diff --git a/llvm/test/BugPoint/remove_arguments_test.ll b/llvm/test/BugPoint/remove_arguments_test.ll
index aaf12a193b6e..9e9c51eaafc3 100644
--- a/llvm/test/BugPoint/remove_arguments_test.ll
+++ b/llvm/test/BugPoint/remove_arguments_test.ll
@@ -12,7 +12,7 @@
 declare i32 @test2()
 
 ; CHECK: define void @test() {
-define i32 @test(i32 %A, %struct.anon* %B, float %C) {
+define i32 @test(i32 %A, ptr %B, float %C) {
 	call i32 @test2()
 	ret i32 %1
 }
diff --git a/llvm/test/BugPoint/replace-funcs-with-null.ll b/llvm/test/BugPoint/replace-funcs-with-null.ll
index 3bc4acd01b2a..783c8a07911c 100644
--- a/llvm/test/BugPoint/replace-funcs-with-null.ll
+++ b/llvm/test/BugPoint/replace-funcs-with-null.ll
@@ -3,7 +3,7 @@
 ; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%pluginext %s -output-prefix %t -replace-funcs-with-null -bugpoint-crash-decl-funcs -silence-passes -safe-run-llc
 ; REQUIRES: plugins
 
-@foo2 = alias i32 (), i32 ()* @foo
+@foo2 = alias i32 (), ptr @foo
 
 define i32 @foo() { ret i32 1 }
 
@@ -14,4 +14,4 @@ define i32 @test() {
 
 define i32 @bar() { ret i32 2 }
 
-@llvm.used = appending global [1 x i8*] [i8* bitcast (i32 ()* @foo to i8*)], section "llvm.metadata"
+@llvm.used = appending global [1 x ptr] [ptr @foo], section "llvm.metadata"