diff --git a/test/CodeGenUPC/array.upc b/test/CodeGenUPC/array.upc
index 9636962724f3..98c2323d5f9b 100644
--- a/test/CodeGenUPC/array.upc
+++ b/test/CodeGenUPC/array.upc
@@ -11,18 +11,18 @@ shared int a[THREADS], b[THREADS*4];
 // dynamic initialization of pointer-to-shared
 // (details omitted for clarity)
 shared int *ptr = a + 2;
-// CHECK-ST: define internal void @__upc_global_var_init() nounwind section "upc_init"
+// CHECK-ST: define internal void @__upc_global_var_init() nounwind
 // CHECK-ST: store %__upc_shared_pointer_type {{.*}}, %__upc_shared_pointer_type* @ptr, align 8
 
-// CHECK-DT: define internal void @__upc_global_var_init() nounwind section "upc_init"
+// CHECK-DT: define internal void @__upc_global_var_init() nounwind
 // CHECK-DT:   %0 = load i32* @THREADS
 // CHECK-DT:  store %__upc_shared_pointer_type %21, %__upc_shared_pointer_type* @ptr, align 8
 
 shared int *pval = &a[3];
-// CHECK-ST: define internal void @__upc_global_var_init1() nounwind section "upc_init"
+// CHECK-ST: define internal void @__upc_global_var_init1() nounwind
 // CHECK-ST: store %__upc_shared_pointer_type {{.*}}, %__upc_shared_pointer_type* @pval, align 8
 
-// CHECK-DT:  define internal void @__upc_global_var_init1() nounwind section "upc_init"
+// CHECK-DT:  define internal void @__upc_global_var_init1() nounwind
 // CHECK-DT:    %0 = load i32* @THREADS
 // CHECK-DT:    store %__upc_shared_pointer_type %21, %__upc_shared_pointer_type* @pval, align 8
 
diff --git a/test/CodeGenUPC/init-shared-int.upc b/test/CodeGenUPC/init-shared-int.upc
index ec5e47f75e07..d33fa5215d6f 100644
--- a/test/CodeGenUPC/init-shared-int.upc
+++ b/test/CodeGenUPC/init-shared-int.upc
@@ -1,7 +1,7 @@
 // RUN: %clang_cc1 %s -emit-llvm -triple x86_64-pc-linux -fupc-threads 4 -o - | FileCheck %s
 
 shared int q = 17;
-// CHECK: define internal void @__upc_global_var_init() nounwind section "upc_init" 
+// CHECK: define internal void @__upc_global_var_init() nounwind
 // CHECK:   %coerce = alloca %__upc_shared_pointer_type, align 8
 // CHECK:   store %__upc_shared_pointer_type { i64 shl (i64 sub (i64 ptrtoint (i32* @q to i64), i64 ptrtoint (i8* @__upc_shared_start to i64)), i64 30) }, %__upc_shared_pointer_type* %coerce, align 8
 // CHECK:   %coerce.dive = getelementptr %__upc_shared_pointer_type* %coerce, i32 0, i32 0
@@ -13,7 +13,7 @@ int f() {
   static shared int r = 23;
   return r;
 }
-// CHECK: define internal void @__upc_global_var_init1() nounwind section "upc_init"
+// CHECK: define internal void @__upc_global_var_init1() nounwind
 // CHECK:   %coerce = alloca %__upc_shared_pointer_type, align 8
 // CHECK:   store %__upc_shared_pointer_type { i64 shl (i64 sub (i64 ptrtoint (i32* @f.r to i64), i64 ptrtoint (i8* @__upc_shared_start to i64)), i64 30) }, %__upc_shared_pointer_type* %coerce, align 8
 // CHECK:   %coerce.dive = getelementptr %__upc_shared_pointer_type* %coerce, i32 0, i32 0
diff --git a/test/CodeGenUPC/static-array.upc b/test/CodeGenUPC/static-array.upc
index d2472ec245a9..9ee03dad9e71 100644
--- a/test/CodeGenUPC/static-array.upc
+++ b/test/CodeGenUPC/static-array.upc
@@ -14,18 +14,18 @@ int f() {
   // dynamic initialization of pointer-to-shared
   // (details omitted for clarity)
   static shared int *ptr = a + 2;
-  // CHECK-ST: define internal void @__upc_global_var_init() nounwind section "upc_init"
+  // CHECK-ST: define internal void @__upc_global_var_init() nounwind
   // CHECK-ST: store %__upc_shared_pointer_type {{.*}}, %__upc_shared_pointer_type* @f.ptr, align 8
 
-  // CHECK-DT: define internal void @__upc_global_var_init() nounwind section "upc_init"
+  // CHECK-DT: define internal void @__upc_global_var_init() nounwind
   // CHECK-DT:   %0 = load i32* @THREADS
   // CHECK-DT:  store %__upc_shared_pointer_type %21, %__upc_shared_pointer_type* @f.ptr, align 8
 
   static shared int *pval = &a[3];
-  // CHECK-ST: define internal void @__upc_global_var_init1() nounwind section "upc_init"
+  // CHECK-ST: define internal void @__upc_global_var_init1() nounwind
   // CHECK-ST: store %__upc_shared_pointer_type {{.*}}, %__upc_shared_pointer_type* @f.pval, align 8
 
-  // CHECK-DT:  define internal void @__upc_global_var_init1() nounwind section "upc_init"
+  // CHECK-DT:  define internal void @__upc_global_var_init1() nounwind
   // CHECK-DT:    %0 = load i32* @THREADS
   // CHECK-DT:    store %__upc_shared_pointer_type %21, %__upc_shared_pointer_type* @f.pval, align 8