diff --git a/test/Index/c-index-api-test.m b/test/Index/c-index-api-test.m
new file mode 100644
index 0000000..d4c6006
--- /dev/null
+++ b/test/Index/c-index-api-test.m
@@ -0,0 +1,192 @@
+// RUN: clang -emit-ast %s -o %t.ast &&
+// RUN: c-index-test %t.ast all | FileCheck %s
+
+// CHECK: <invalid loc>:0:0: StructDecl=objc_selector [Context=c-index-api-test.m]
+// CHECK: <invalid loc>:0:0: TypedefDecl=SEL [Context=c-index-api-test.m]
+// CHECK: <invalid loc>:0:0: ObjCInterfaceDecl=Protocol [Context=c-index-api-test.m]
+// CHECK: <invalid loc>:0:0: TypedefDecl=id [Context=c-index-api-test.m]
+// CHECK: <invalid loc>:0:0: TypedefDecl=Class [Context=c-index-api-test.m]
+// CHECK: <built-in>:75:15: TypedefDecl=__builtin_va_list [Context=c-index-api-test.m]
+
+@interface Foo 
+{
+}
+
+- foo;
++ fooC;
+
+@end
+
+@interface Bar : Foo 
+{
+}
+
+@end
+
+@interface Foo (FooCat)
+- (int) catMethodWithFloat:(float) fArg;
+- (float) floatMethod;
+@end
+
+@protocol Proto
+- pMethod;
+@end
+
+@protocol SubP <Proto>
+- spMethod;
+@end
+
+@interface Baz : Bar <SubP>
+{
+    int _anIVar;
+}
+
+- (Foo *) bazMethod;
+
+@end
+
+enum {
+  someEnum
+};
+
+// CHECK: c-index-api-test.m:11:12: ObjCInterfaceDecl=Foo [Context=c-index-api-test.m]
+// CHECK: c-index-api-test.m:15:1: ObjCInstanceMethodDecl=foo [Context=Foo]
+// CHECK: c-index-api-test.m:16:1: ObjCClassMethodDecl=fooC [Context=Foo]
+// CHECK: c-index-api-test.m:20:12: ObjCInterfaceDecl=Bar [Context=c-index-api-test.m]
+// CHECK: c-index-api-test.m:20:18: ObjCSuperClassRef=Foo [Context=Bar]
+// CHECK: c-index-api-test.m:26:1: ObjCCategoryDecl=FooCat [Context=c-index-api-test.m]
+// CHECK: <invalid loc>:0:0: ObjCClassRef=Foo [Context=FooCat]
+// CHECK: c-index-api-test.m:27:1: ObjCInstanceMethodDecl=catMethodWithFloat: [Context=FooCat]
+// CHECK: c-index-api-test.m:28:1: ObjCInstanceMethodDecl=floatMethod [Context=FooCat]
+// CHECK: c-index-api-test.m:31:1: ObjCProtocolDecl=Proto [Context=c-index-api-test.m]
+// CHECK: c-index-api-test.m:32:1: ObjCInstanceMethodDecl=pMethod [Context=Proto]
+// CHECK: c-index-api-test.m:35:1: ObjCProtocolDecl=SubP [Context=c-index-api-test.m]
+// CHECK: c-index-api-test.m:31:1: ObjCProtocolRef=Proto [Context=SubP]
+// CHECK: c-index-api-test.m:36:1: ObjCInstanceMethodDecl=spMethod [Context=SubP]
+// CHECK: c-index-api-test.m:39:12: ObjCInterfaceDecl=Baz [Context=c-index-api-test.m]
+// CHECK: c-index-api-test.m:39:18: ObjCSuperClassRef=Bar [Context=Baz]
+// CHECK: c-index-api-test.m:35:1: ObjCProtocolRef=SubP [Context=Baz]
+// CHECK: c-index-api-test.m:41:9: ObjCIvarDecl=_anIVar [Context=Baz]
+// CHECK: c-index-api-test.m:44:1: ObjCInstanceMethodDecl=bazMethod [Context=Baz]
+// CHECK: c-index-api-test.m:48:1: EnumDecl= [Context=c-index-api-test.m]
+// CHECK: c-index-api-test.m:49:3: EnumConstantDecl=someEnum [Context=]
+
+int main (int argc, const char * argv[]) {
+	Baz * bee;
+	id a = [bee foo];
+	id <SubP> c = [Foo fooC];
+	id <Proto> d;
+	d = c;
+	[d pMethod];
+	[bee catMethodWithFloat:[bee floatMethod]];
+  main(someEnum, (const char **)bee);
+}
+
+// CHECK: c-index-api-test.m:74:5: FunctionDefn=main [Context=c-index-api-test.m]
+// CHECK: c-index-api-test.m:74:15: ParmDecl=argc [Context=main]
+// CHECK: c-index-api-test.m:74:34: ParmDecl=argv [Context=main]
+// CHECK: c-index-api-test.m:75:8: VarDecl=bee [Context=main]
+// CHECK: c-index-api-test.m:76:5: VarDecl=a [Context=main]
+// CHECK: c-index-api-test.m:77:12: VarDecl=c [Context=main]
+// CHECK: c-index-api-test.m:78:13: VarDecl=d [Context=main]
+// CHECK: c-index-api-test.m:75:8: VarDecl=bee [Context:bee]
+// CHECK: c-index-api-test.m:75:9: VarDecl=bee [Context:bee]
+// CHECK: c-index-api-test.m:75:10: VarDecl=bee [Context:bee]
+// CHECK: c-index-api-test.m:76:5: VarDecl=a [Context:a]
+// CHECK: c-index-api-test.m:76:6: VarDecl=a [Context:a]
+// CHECK: c-index-api-test.m:76:7: VarDecl=a [Context:a]
+// CHECK: c-index-api-test.m:76:8: VarDecl=a [Context:a]
+// CHECK: c-index-api-test.m:76:9: ObjCSelectorRef=foo [Context:a]
+// CHECK: c-index-api-test.m:76:10: VarRef=bee [Context:a]
+// CHECK: c-index-api-test.m:76:11: VarRef=bee [Context:a]
+// CHECK: c-index-api-test.m:76:12: VarRef=bee [Context:a]
+// CHECK: c-index-api-test.m:76:13: ObjCSelectorRef=foo [Context:a]
+// CHECK: c-index-api-test.m:76:14: ObjCSelectorRef=foo [Context:a]
+// CHECK: c-index-api-test.m:76:15: ObjCSelectorRef=foo [Context:a]
+// CHECK: c-index-api-test.m:76:16: ObjCSelectorRef=foo [Context:a]
+// CHECK: c-index-api-test.m:76:17: ObjCSelectorRef=foo [Context:a]
+// CHECK: c-index-api-test.m:77:12: VarDecl=c [Context:c]
+// CHECK: c-index-api-test.m:77:13: VarDecl=c [Context:c]
+// CHECK: c-index-api-test.m:77:14: VarDecl=c [Context:c]
+// CHECK: c-index-api-test.m:77:15: VarDecl=c [Context:c]
+// CHECK: c-index-api-test.m:77:16: ObjCSelectorRef=fooC [Context:c]
+// CHECK: c-index-api-test.m:77:17: ObjCSelectorRef=fooC [Context:c]
+// CHECK: c-index-api-test.m:77:18: ObjCSelectorRef=fooC [Context:c]
+// CHECK: c-index-api-test.m:77:19: ObjCSelectorRef=fooC [Context:c]
+// CHECK: c-index-api-test.m:77:20: ObjCSelectorRef=fooC [Context:c]
+// CHECK: c-index-api-test.m:77:21: ObjCSelectorRef=fooC [Context:c]
+// CHECK: c-index-api-test.m:77:22: ObjCSelectorRef=fooC [Context:c]
+// CHECK: c-index-api-test.m:77:23: ObjCSelectorRef=fooC [Context:c]
+// CHECK: c-index-api-test.m:77:24: ObjCSelectorRef=fooC [Context:c]
+// CHECK: c-index-api-test.m:77:25: ObjCSelectorRef=fooC [Context:c]
+// CHECK: c-index-api-test.m:78:13: VarDecl=d [Context:d]
+// CHECK: c-index-api-test.m:79:2: VarRef=d [Context:main]
+// CHECK: c-index-api-test.m:79:6: VarRef=c [Context:main]
+// CHECK: c-index-api-test.m:80:2: ObjCSelectorRef=pMethod [Context:main]
+// CHECK: c-index-api-test.m:80:3: VarRef=d [Context:main]
+// CHECK: c-index-api-test.m:80:4: ObjCSelectorRef=pMethod [Context:main]
+// CHECK: c-index-api-test.m:80:5: ObjCSelectorRef=pMethod [Context:main]
+// CHECK: c-index-api-test.m:80:6: ObjCSelectorRef=pMethod [Context:main]
+// CHECK: c-index-api-test.m:80:7: ObjCSelectorRef=pMethod [Context:main]
+// CHECK: c-index-api-test.m:80:8: ObjCSelectorRef=pMethod [Context:main]
+// CHECK: c-index-api-test.m:80:9: ObjCSelectorRef=pMethod [Context:main]
+// CHECK: c-index-api-test.m:80:10: ObjCSelectorRef=pMethod [Context:main]
+// CHECK: c-index-api-test.m:80:11: ObjCSelectorRef=pMethod [Context:main]
+// CHECK: c-index-api-test.m:80:12: ObjCSelectorRef=pMethod [Context:main]
+// CHECK: c-index-api-test.m:81:2: ObjCSelectorRef=catMethodWithFloat: [Context:main]
+// CHECK: c-index-api-test.m:81:3: VarRef=bee [Context:main]
+// CHECK: c-index-api-test.m:81:4: VarRef=bee [Context:main]
+// CHECK: c-index-api-test.m:81:5: VarRef=bee [Context:main]
+// CHECK: c-index-api-test.m:81:6: ObjCSelectorRef=catMethodWithFloat: [Context:main]
+// CHECK: c-index-api-test.m:81:7: ObjCSelectorRef=catMethodWithFloat: [Context:main]
+// CHECK: c-index-api-test.m:81:8: ObjCSelectorRef=catMethodWithFloat: [Context:main]
+// CHECK: c-index-api-test.m:81:9: ObjCSelectorRef=catMethodWithFloat: [Context:main]
+// CHECK: c-index-api-test.m:81:10: ObjCSelectorRef=catMethodWithFloat: [Context:main]
+// CHECK: c-index-api-test.m:81:11: ObjCSelectorRef=catMethodWithFloat: [Context:main]
+// CHECK: c-index-api-test.m:81:12: ObjCSelectorRef=catMethodWithFloat: [Context:main]
+// CHECK: c-index-api-test.m:81:13: ObjCSelectorRef=catMethodWithFloat: [Context:main]
+// CHECK: c-index-api-test.m:81:14: ObjCSelectorRef=catMethodWithFloat: [Context:main]
+// CHECK: c-index-api-test.m:81:15: ObjCSelectorRef=catMethodWithFloat: [Context:main]
+// CHECK: c-index-api-test.m:81:16: ObjCSelectorRef=catMethodWithFloat: [Context:main]
+// CHECK: c-index-api-test.m:81:17: ObjCSelectorRef=catMethodWithFloat: [Context:main]
+// CHECK: c-index-api-test.m:81:18: ObjCSelectorRef=catMethodWithFloat: [Context:main]
+// CHECK: c-index-api-test.m:81:19: ObjCSelectorRef=catMethodWithFloat: [Context:main]
+// CHECK: c-index-api-test.m:81:20: ObjCSelectorRef=catMethodWithFloat: [Context:main]
+// CHECK: c-index-api-test.m:81:21: ObjCSelectorRef=catMethodWithFloat: [Context:main]
+// CHECK: c-index-api-test.m:81:22: ObjCSelectorRef=catMethodWithFloat: [Context:main]
+// CHECK: c-index-api-test.m:81:23: ObjCSelectorRef=catMethodWithFloat: [Context:main]
+// CHECK: c-index-api-test.m:81:24: ObjCSelectorRef=catMethodWithFloat: [Context:main]
+// CHECK: c-index-api-test.m:81:25: ObjCSelectorRef=catMethodWithFloat: [Context:main]
+// CHECK: c-index-api-test.m:81:26: ObjCSelectorRef=floatMethod [Context:main]
+// CHECK: c-index-api-test.m:81:27: VarRef=bee [Context:main]
+// CHECK: c-index-api-test.m:81:28: VarRef=bee [Context:main]
+// CHECK: c-index-api-test.m:81:29: VarRef=bee [Context:main]
+// CHECK: c-index-api-test.m:81:30: ObjCSelectorRef=floatMethod [Context:main]
+// CHECK: c-index-api-test.m:81:31: ObjCSelectorRef=floatMethod [Context:main]
+// CHECK: c-index-api-test.m:81:32: ObjCSelectorRef=floatMethod [Context:main]
+// CHECK: c-index-api-test.m:81:33: ObjCSelectorRef=floatMethod [Context:main]
+// CHECK: c-index-api-test.m:81:34: ObjCSelectorRef=floatMethod [Context:main]
+// CHECK: c-index-api-test.m:81:35: ObjCSelectorRef=floatMethod [Context:main]
+// CHECK: c-index-api-test.m:81:36: ObjCSelectorRef=floatMethod [Context:main]
+// CHECK: c-index-api-test.m:81:37: ObjCSelectorRef=floatMethod [Context:main]
+// CHECK: c-index-api-test.m:81:38: ObjCSelectorRef=floatMethod [Context:main]
+// CHECK: c-index-api-test.m:81:39: ObjCSelectorRef=floatMethod [Context:main]
+// CHECK: c-index-api-test.m:81:40: ObjCSelectorRef=floatMethod [Context:main]
+// CHECK: c-index-api-test.m:81:41: ObjCSelectorRef=floatMethod [Context:main]
+// CHECK: c-index-api-test.m:81:42: ObjCSelectorRef=floatMethod [Context:main]
+// CHECK: c-index-api-test.m:81:43: ObjCSelectorRef=catMethodWithFloat: [Context:main]
+// CHECK: c-index-api-test.m:82:3: FunctionRef=main [Context:main]
+// CHECK: c-index-api-test.m:82:4: FunctionRef=main [Context:main]
+// CHECK: c-index-api-test.m:82:5: FunctionRef=main [Context:main]
+// CHECK: c-index-api-test.m:82:6: FunctionRef=main [Context:main]
+// CHECK: c-index-api-test.m:82:8: EnumConstantRef=someEnum [Context:main]
+// CHECK: c-index-api-test.m:82:9: EnumConstantRef=someEnum [Context:main]
+// CHECK: c-index-api-test.m:82:10: EnumConstantRef=someEnum [Context:main]
+// CHECK: c-index-api-test.m:82:11: EnumConstantRef=someEnum [Context:main]
+// CHECK: c-index-api-test.m:82:12: EnumConstantRef=someEnum [Context:main]
+// CHECK: c-index-api-test.m:82:13: EnumConstantRef=someEnum [Context:main]
+// CHECK: c-index-api-test.m:82:14: EnumConstantRef=someEnum [Context:main]
+// CHECK: c-index-api-test.m:82:15: EnumConstantRef=someEnum [Context:main]
+// CHECK: c-index-api-test.m:82:33: VarRef=bee [Context:main]
+// CHECK: c-index-api-test.m:82:34: VarRef=bee [Context:main]
+// CHECK: c-index-api-test.m:82:35: VarRef=bee [Context:main]
diff --git a/tools/c-index-test/c-index-test.c b/tools/c-index-test/c-index-test.c
index 9e94058..f1f9372 100644
--- a/tools/c-index-test/c-index-test.c
+++ b/tools/c-index-test/c-index-test.c
@@ -4,33 +4,37 @@
 #include <stdio.h>
 #include <string.h>
 
+extern char *basename(const char *);
+
 static void PrintCursor(CXCursor Cursor) {
   if (clang_isInvalid(Cursor.kind))
     printf("Invalid Cursor => %s\n", clang_getCursorKindSpelling(Cursor.kind));
   else
-    printf("%s => %s ", clang_getCursorKindSpelling(Cursor.kind),
-                        clang_getCursorSpelling(Cursor));
+    printf("%s=%s", clang_getCursorKindSpelling(Cursor.kind),
+                      clang_getCursorSpelling(Cursor));
 }
 
 static void DeclVisitor(CXDecl Dcl, CXCursor Cursor, CXClientData Filter) 
 {
   if (!Filter || (Cursor.kind == *(enum CXCursorKind *)Filter)) {
+    printf("// CHECK: %s:%d:%d: ", basename(clang_getCursorSource(Cursor)),
+                                 clang_getCursorLine(Cursor),
+                                 clang_getCursorColumn(Cursor));
     PrintCursor(Cursor);
-    printf("(Context: %s", clang_getDeclSpelling(Dcl));
-    printf(" Source:  %s (%d:%d))\n", clang_getCursorSource(Cursor),
-                                      clang_getCursorLine(Cursor),
-                                      clang_getCursorColumn(Cursor));
+    printf(" [Context=%s]\n", clang_getDeclSpelling(Dcl));
   }
 }
 static void TranslationUnitVisitor(CXTranslationUnit Unit, CXCursor Cursor,
                                    CXClientData Filter) 
 {
   if (!Filter || (Cursor.kind == *(enum CXCursorKind *)Filter)) {
+    printf("// CHECK: %s:%d:%d: ", basename(clang_getCursorSource(Cursor)),
+                                 clang_getCursorLine(Cursor),
+                                 clang_getCursorColumn(Cursor));
     PrintCursor(Cursor);
-    printf("(Context: %s", clang_getTranslationUnitSpelling(Unit));
-    printf(" Source:  %s (%d:%d))\n", clang_getCursorSource(Cursor),
-                                      clang_getCursorLine(Cursor),
-                                      clang_getCursorColumn(Cursor));
+    printf(" [Context=%s]\n", basename(clang_getTranslationUnitSpelling(Unit)));
+
+    clang_loadDeclaration(Cursor.decl, DeclVisitor, 0);
 
     if (Cursor.kind == CXCursor_FunctionDefn) {
       const char *startBuf, *endBuf;
@@ -54,16 +58,15 @@
           Ref = clang_getCursor(Unit, clang_getCursorSource(Cursor), 
                                 curLine, curColumn);
           if (Ref.kind != CXCursor_FunctionDecl) {
+            printf("// CHECK: %s:%d:%d: ", basename(clang_getCursorSource(Ref)),
+                                             curLine, curColumn);
             PrintCursor(Ref);
-            printf("(Context: %s", clang_getDeclSpelling(Ref.decl));
-            printf(" Source:  %s (%d:%d))\n", clang_getCursorSource(Ref),
-                                              curLine, curColumn);
+            printf(" [Context:%s]\n", clang_getDeclSpelling(Ref.decl));
           }
           startBuf++;
         }
       }
     }
-    clang_loadDeclaration(Cursor.decl, DeclVisitor, 0);
   }
 }