diff --git a/test/API/commands/expression/context-object-objc/Makefile b/test/API/commands/expression/context-object-objc/Makefile
index a3198db..11fce1e 100644
--- a/test/API/commands/expression/context-object-objc/Makefile
+++ b/test/API/commands/expression/context-object-objc/Makefile
@@ -1,3 +1,4 @@
 OBJC_SOURCES := main.m
-LD_EXTRAS := -framework Foundation
+LD_EXTRAS := -lobjc
+
 include Makefile.rules
diff --git a/test/API/commands/expression/context-object-objc/main.m b/test/API/commands/expression/context-object-objc/main.m
index 5c495b2..dd63b7b 100644
--- a/test/API/commands/expression/context-object-objc/main.m
+++ b/test/API/commands/expression/context-object-objc/main.m
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+#import <objc/NSObject.h>
 
 @interface ObjcClass : NSObject {
     int field;
diff --git a/test/API/commands/expression/namespace_local_var_same_name_obj_c/main.mm b/test/API/commands/expression/namespace_local_var_same_name_obj_c/main.mm
index 70e9598..62e4475 100644
--- a/test/API/commands/expression/namespace_local_var_same_name_obj_c/main.mm
+++ b/test/API/commands/expression/namespace_local_var_same_name_obj_c/main.mm
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+#import <objc/NSObject.h>
 @interface Util : NSObject
 + (void)debugPrintErrorStatic;
 - (void)debugPrintError;
diff --git a/test/API/commands/frame/recognizer/Makefile b/test/API/commands/frame/recognizer/Makefile
index 8248c01..09f6bd5 100644
--- a/test/API/commands/frame/recognizer/Makefile
+++ b/test/API/commands/frame/recognizer/Makefile
@@ -1,9 +1,5 @@
 OBJC_SOURCES := main.m
-
 CFLAGS_EXTRAS := -g0 # No debug info.
 MAKE_DSYM := NO
 
-
-
-LD_EXTRAS := -framework Foundation
 include Makefile.rules
diff --git a/test/API/commands/frame/recognizer/main.m b/test/API/commands/frame/recognizer/main.m
index 5d064c2..6546692 100644
--- a/test/API/commands/frame/recognizer/main.m
+++ b/test/API/commands/frame/recognizer/main.m
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+#import <stdio.h>
 
 void foo(int a, int b)
 {
diff --git a/test/API/functionalities/type_lookup/Makefile b/test/API/functionalities/type_lookup/Makefile
index 8763401..547bb7e 100644
--- a/test/API/functionalities/type_lookup/Makefile
+++ b/test/API/functionalities/type_lookup/Makefile
@@ -1,8 +1,5 @@
 OBJCXX_SOURCES := main.mm
-
 CFLAGS_EXTRAS := -w
+LD_EXTRAS := -lobjc
 
-
-
-LD_EXTRAS := -framework Foundation
 include Makefile.rules
diff --git a/test/API/functionalities/type_lookup/main.mm b/test/API/functionalities/type_lookup/main.mm
index 663bd11..88da46d 100644
--- a/test/API/functionalities/type_lookup/main.mm
+++ b/test/API/functionalities/type_lookup/main.mm
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+#import <objc/NSObject.h>
 
 class MyCPPClass {
 public:
diff --git a/test/API/lang/objc/bitfield_ivars/Makefile b/test/API/lang/objc/bitfield_ivars/Makefile
index a68dad5..1b3b326 100644
--- a/test/API/lang/objc/bitfield_ivars/Makefile
+++ b/test/API/lang/objc/bitfield_ivars/Makefile
@@ -1,4 +1,4 @@
 OBJC_SOURCES := main.m
-LD_EXTRAS = -framework Foundation
+LD_EXTRAS = -lobjc
 
 include Makefile.rules
diff --git a/test/API/lang/objc/bitfield_ivars/main.m b/test/API/lang/objc/bitfield_ivars/main.m
index ce0ca31..75d3239 100644
--- a/test/API/lang/objc/bitfield_ivars/main.m
+++ b/test/API/lang/objc/bitfield_ivars/main.m
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+#import <objc/NSObject.h>
 
 typedef struct {
     unsigned char fieldOne : 1;
diff --git a/test/API/lang/objc/blocks/Makefile b/test/API/lang/objc/blocks/Makefile
index df76ed3..14af79a 100644
--- a/test/API/lang/objc/blocks/Makefile
+++ b/test/API/lang/objc/blocks/Makefile
@@ -1,4 +1,4 @@
 OBJC_SOURCES := ivars-in-blocks.m main.m
-LD_EXTRAS := -lobjc -framework Foundation
+LD_EXTRAS := -lobjc
 
 include Makefile.rules
diff --git a/test/API/lang/objc/blocks/ivars-in-blocks.h b/test/API/lang/objc/blocks/ivars-in-blocks.h
index 1ceac33..cf5eba7 100644
--- a/test/API/lang/objc/blocks/ivars-in-blocks.h
+++ b/test/API/lang/objc/blocks/ivars-in-blocks.h
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+#import <objc/NSObject.h>
 
 @interface IAmBlocky : NSObject
 {
diff --git a/test/API/lang/objc/blocks/ivars-in-blocks.m b/test/API/lang/objc/blocks/ivars-in-blocks.m
index 1098a91..37d266f 100644
--- a/test/API/lang/objc/blocks/ivars-in-blocks.m
+++ b/test/API/lang/objc/blocks/ivars-in-blocks.m
@@ -1,4 +1,5 @@
 #import "ivars-in-blocks.h"
+#import <stdio.h>
 
 typedef int (^my_block_ptr_type) (int);
 
diff --git a/test/API/lang/objc/conflicting-definition/Test/Test.h b/test/API/lang/objc/conflicting-definition/Test/Test.h
index 73928c5..ff50ddb 100644
--- a/test/API/lang/objc/conflicting-definition/Test/Test.h
+++ b/test/API/lang/objc/conflicting-definition/Test/Test.h
@@ -1,5 +1,5 @@
-#import <Foundation/Foundation.h>
 #import <Test/Foo.h>
+#import <objc/NSObject.h>
 
 @interface Test : NSObject {
 @public
diff --git a/test/API/lang/objc/forward-decl/Container.h b/test/API/lang/objc/forward-decl/Container.h
index 85bbd06..2b53e28 100644
--- a/test/API/lang/objc/forward-decl/Container.h
+++ b/test/API/lang/objc/forward-decl/Container.h
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+#import <objc/NSObject.h>
 
 @class ForwardDeclaredClass;
 
diff --git a/test/API/lang/objc/forward-decl/Makefile b/test/API/lang/objc/forward-decl/Makefile
index cfae251..252dfb6 100644
--- a/test/API/lang/objc/forward-decl/Makefile
+++ b/test/API/lang/objc/forward-decl/Makefile
@@ -1,8 +1,6 @@
 DYLIB_NAME := Container
 DYLIB_OBJC_SOURCES := Container.m
 OBJC_SOURCES := main.m
+LD_EXTRAS := -lobjc
 
-
-
-LD_EXTRAS := -framework Foundation
 include Makefile.rules
diff --git a/test/API/lang/objc/forward-decl/main.m b/test/API/lang/objc/forward-decl/main.m
index 8e5256e..7b65248 100644
--- a/test/API/lang/objc/forward-decl/main.m
+++ b/test/API/lang/objc/forward-decl/main.m
@@ -1,5 +1,6 @@
-#import <Foundation/Foundation.h>
+#import <objc/NSObject.h>
 #import "Container.h"
+#import <stdio.h>
 
 int main(int argc, const char * argv[])
 {
diff --git a/test/API/lang/objc/foundation/my-base.m b/test/API/lang/objc/foundation/my-base.m
index 0c316b2..4147ac1 100644
--- a/test/API/lang/objc/foundation/my-base.m
+++ b/test/API/lang/objc/foundation/my-base.m
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+#import <objc/NSObject.h>
 #import "my-base.h"
 @implementation MyBase
 #if __OBJC2__
diff --git a/test/API/lang/objc/hidden-ivars/InternalDefiner.h b/test/API/lang/objc/hidden-ivars/InternalDefiner.h
index 59652d4..f5d8e01 100644
--- a/test/API/lang/objc/hidden-ivars/InternalDefiner.h
+++ b/test/API/lang/objc/hidden-ivars/InternalDefiner.h
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+#import <objc/NSObject.h>
 #import <stdint.h>
 
 @interface InternalDefiner : NSObject {
diff --git a/test/API/lang/objc/ivar-IMP/Makefile b/test/API/lang/objc/ivar-IMP/Makefile
index 5d920f4..91d4666 100644
--- a/test/API/lang/objc/ivar-IMP/Makefile
+++ b/test/API/lang/objc/ivar-IMP/Makefile
@@ -1,5 +1,5 @@
 OBJC_SOURCES := myclass.m repro.m
-LD_EXTRAS := -framework Foundation
+LD_EXTRAS := -lobjc
 
 include Makefile.rules
 
diff --git a/test/API/lang/objc/ivar-IMP/myclass.h b/test/API/lang/objc/ivar-IMP/myclass.h
index da28d1e..2dfa3dd 100644
--- a/test/API/lang/objc/ivar-IMP/myclass.h
+++ b/test/API/lang/objc/ivar-IMP/myclass.h
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+#import <objc/NSObject.h>
 
 @interface MyClass : NSObject
 {}
diff --git a/test/API/lang/objc/ivar-IMP/myclass.m b/test/API/lang/objc/ivar-IMP/myclass.m
index 85b2fcf..6515180 100644
--- a/test/API/lang/objc/ivar-IMP/myclass.m
+++ b/test/API/lang/objc/ivar-IMP/myclass.m
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+#import <objc/NSObject.h>
 #import "myclass.h"
 
 @implementation MyClass
diff --git a/test/API/lang/objc/ivar-IMP/repro.m b/test/API/lang/objc/ivar-IMP/repro.m
index 14f911f..289ee5f 100644
--- a/test/API/lang/objc/ivar-IMP/repro.m
+++ b/test/API/lang/objc/ivar-IMP/repro.m
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+#import <objc/NSObject.h>
 #import "myclass.h"
 
 int main() {
diff --git a/test/API/lang/objc/modules-objc-property/main.m b/test/API/lang/objc/modules-objc-property/main.m
index c0f58f4..54d69c0 100644
--- a/test/API/lang/objc/modules-objc-property/main.m
+++ b/test/API/lang/objc/modules-objc-property/main.m
@@ -1,4 +1,4 @@
-@import Foundation;
+@import ObjectiveC;
 @import myModule;
 
 int main() {
diff --git a/test/API/lang/objc/modules-objc-property/myModule.h b/test/API/lang/objc/modules-objc-property/myModule.h
index 07b40cc..4377d30 100644
--- a/test/API/lang/objc/modules-objc-property/myModule.h
+++ b/test/API/lang/objc/modules-objc-property/myModule.h
@@ -1,7 +1,7 @@
 #ifndef MYMODULE
 #define MYMODULE
 
-@import Foundation;
+@import ObjectiveC;
 
 @interface MyClass : NSObject
 - (int) propConflict;
diff --git a/test/API/lang/objc/objc-ivar-offsets/Makefile b/test/API/lang/objc/objc-ivar-offsets/Makefile
index 5408f41..83821a6 100644
--- a/test/API/lang/objc/objc-ivar-offsets/Makefile
+++ b/test/API/lang/objc/objc-ivar-offsets/Makefile
@@ -1,4 +1,4 @@
 OBJC_SOURCES := objc-ivar-offsets.m main.m
-LD_EXTRAS := -lobjc -framework Foundation
+LD_EXTRAS := -lobjc
 
 include Makefile.rules
diff --git a/test/API/lang/objc/objc-ivar-offsets/objc-ivar-offsets.h b/test/API/lang/objc/objc-ivar-offsets/objc-ivar-offsets.h
index 99bbd42..6592c0f 100644
--- a/test/API/lang/objc/objc-ivar-offsets/objc-ivar-offsets.h
+++ b/test/API/lang/objc/objc-ivar-offsets/objc-ivar-offsets.h
@@ -1,4 +1,5 @@
-#import <Foundation/Foundation.h>
+#import <objc/NSObject.h>
+#import <stdint.h>
 
 @interface BaseClass : NSObject
 {
diff --git a/test/API/lang/objc/objc-super/Makefile b/test/API/lang/objc/objc-super/Makefile
index e6db3de..6df044b 100644
--- a/test/API/lang/objc/objc-super/Makefile
+++ b/test/API/lang/objc/objc-super/Makefile
@@ -1,4 +1,4 @@
 OBJC_SOURCES := class.m
-LD_EXTRAS := -lobjc -framework Foundation
+LD_EXTRAS := -lobjc
 
 include Makefile.rules
diff --git a/test/API/lang/objc/objc-super/class.m b/test/API/lang/objc/objc-super/class.m
index b55b649..a300087 100644
--- a/test/API/lang/objc/objc-super/class.m
+++ b/test/API/lang/objc/objc-super/class.m
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+#import <objc/NSObject.h>
 
 @interface Foo : NSObject {
 }
diff --git a/test/API/lang/objcxx/class-name-clash/myobject.mm b/test/API/lang/objcxx/class-name-clash/myobject.mm
index 051c4e5..5c40746 100644
--- a/test/API/lang/objcxx/class-name-clash/myobject.mm
+++ b/test/API/lang/objcxx/class-name-clash/myobject.mm
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+#import <objc/NSObject.h>
 
 @interface MyObject : NSObject
 @end
diff --git a/test/API/python_api/class_members/main.mm b/test/API/python_api/class_members/main.mm
index b84f4d3..723cb61 100644
--- a/test/API/python_api/class_members/main.mm
+++ b/test/API/python_api/class_members/main.mm
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+#import <objc/NSObject.h>
 
 class Base {
 public:
diff --git a/test/API/python_api/objc_type/Makefile b/test/API/python_api/objc_type/Makefile
index 8b322ff..5f07431 100644
--- a/test/API/python_api/objc_type/Makefile
+++ b/test/API/python_api/objc_type/Makefile
@@ -1,8 +1,5 @@
 OBJC_SOURCES := main.m
-
 CFLAGS_EXTRAS := -w
+LD_EXTRAS := -lobjc
 
-
-
-LD_EXTRAS := -framework Foundation
 include Makefile.rules
diff --git a/test/API/python_api/objc_type/main.m b/test/API/python_api/objc_type/main.m
index 941442f..6075622 100644
--- a/test/API/python_api/objc_type/main.m
+++ b/test/API/python_api/objc_type/main.m
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+#import <objc/NSObject.h>
 
 @interface Foo: NSObject
 {}