Index: clang-tools-extra/trunk/test/clang-rename/ClassTest.cpp
===================================================================
--- clang-tools-extra/trunk/test/clang-rename/ClassTest.cpp
+++ clang-tools-extra/trunk/test/clang-rename/ClassTest.cpp
@@ -1,9 +1,9 @@
+// RUN: cat %s > %t.cpp
+// RUN: clang-rename -offset=138 -new-name=Hector %t.cpp -i --
+// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
 class Cla  // CHECK: class Hector
 {
 };
-// RUN: cat %s > %t.cpp
-// RUN: clang-rename -offset=6 -new-name=Hector %t.cpp -i --
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
 
 int main()
 {
Index: clang-tools-extra/trunk/test/clang-rename/FieldTest.cpp
===================================================================
--- clang-tools-extra/trunk/test/clang-rename/FieldTest.cpp
+++ clang-tools-extra/trunk/test/clang-rename/FieldTest.cpp
@@ -1,12 +1,12 @@
+// RUN: cat %s > %t.cpp
+// RUN: clang-rename -offset=150 -new-name=hector %t.cpp -i --
+// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
 class Cla
 {
   int foo; // CHECK: hector;
 public:
   Cla();
 };
-// RUN: cat %s > %t.cpp
-// RUN: clang-rename -offset=18 -new-name=hector %t.cpp -i --
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
 
 Cla::Cla()
   : foo(0) // CHECK: hector(0)
Index: clang-tools-extra/trunk/test/clang-rename/VarTest.cpp
===================================================================
--- clang-tools-extra/trunk/test/clang-rename/VarTest.cpp
+++ clang-tools-extra/trunk/test/clang-rename/VarTest.cpp
@@ -1,8 +1,8 @@
-namespace A { int foo;  // CHECK: int hector;
-}
 // RUN: cat %s > %t.cpp
-// RUN: clang-rename -offset=18 -new-name=hector %t.cpp -i --
+// RUN: clang-rename -offset=150 -new-name=hector %t.cpp -i --
 // RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
+namespace A { int foo;  // CHECK: int hector;
+}
 int foo;  // CHECK: int foo;
 int bar = foo; // CHECK: bar = foo;
 int baz = A::foo; // CHECK: baz = A::hector;