diff --git a/.travis.yml b/.travis.yml
index 6b371f3c2..b39f75094 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,12 +2,14 @@ language: objective-c
 matrix:
     include:
         - osx_image: xcode7.2
-          env: IPHONE_SDK=iphonesimulator9.2
+          env: SDK=macosx10.11 BUILD_OSX=1
+        - osx_image: xcode7.2
+          env: SDK=iphonesimulator9.2
         - osx_image: xcode6.1
-          env: IPHONE_SDK=iphonesimulator8.1
+          env: SDK=iphonesimulator8.1
         - osx_image: xcode6.1
-          env: IPHONE_SDK=iphonesimulator7.1
+          env: SDK=iphonesimulator7.1
         - osx_image: xcode6.1
-          env: IPHONE_SDK=iphonesimulator7.0
+          env: SDK=iphonesimulator7.0
 install: make bootstrap
 script: make test
diff --git a/Bugsnag.xcodeproj/project.pbxproj b/Bugsnag.xcodeproj/project.pbxproj
index 75084415f..c98c8409b 100644
--- a/Bugsnag.xcodeproj/project.pbxproj
+++ b/Bugsnag.xcodeproj/project.pbxproj
@@ -96,12 +96,18 @@
 		79FD0E301A0C1AAB0050DBC5 /* Bugsnag.h in Headers */ = {isa = PBXBuildFile; fileRef = 79FD0D541A0C168B0050DBC5 /* Bugsnag.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		79FD0E311A0C1AAF0050DBC5 /* BugsnagMetaData.h in Headers */ = {isa = PBXBuildFile; fileRef = 79FD0D5A1A0C168B0050DBC5 /* BugsnagMetaData.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		79FD0E321A0C1AB30050DBC5 /* BugsnagConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 79FD0D561A0C168B0050DBC5 /* BugsnagConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		8A4C96F11BAA2DEA007B2BFC /* BugsnagBreadcrumbsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 8A4C96F01BAA2DEA007B2BFC /* BugsnagBreadcrumbsTest.m */; settings = {ASSET_TAGS = (); }; };
-		8A4C96F41BAA2EC9007B2BFC /* BugsnagBreadcrumb.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A4C96F21BAA2EC9007B2BFC /* BugsnagBreadcrumb.h */; settings = {ASSET_TAGS = (); }; };
-		8A4C96F51BAA2EC9007B2BFC /* BugsnagBreadcrumb.m in Sources */ = {isa = PBXBuildFile; fileRef = 8A4C96F31BAA2EC9007B2BFC /* BugsnagBreadcrumb.m */; settings = {ASSET_TAGS = (); }; };
-		8A4C96F61BAA2EC9007B2BFC /* BugsnagBreadcrumb.m in Sources */ = {isa = PBXBuildFile; fileRef = 8A4C96F31BAA2EC9007B2BFC /* BugsnagBreadcrumb.m */; settings = {ASSET_TAGS = (); }; };
-		8A4C96F81BAA2EDA007B2BFC /* BugsnagBreadcrumb.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A4C96F21BAA2EC9007B2BFC /* BugsnagBreadcrumb.h */; settings = {ASSET_TAGS = (); }; };
-		8A4C96F91BAA2EDD007B2BFC /* BugsnagBreadcrumb.m in Sources */ = {isa = PBXBuildFile; fileRef = 8A4C96F31BAA2EC9007B2BFC /* BugsnagBreadcrumb.m */; settings = {ASSET_TAGS = (); }; };
+		8A4C96F11BAA2DEA007B2BFC /* BugsnagBreadcrumbsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 8A4C96F01BAA2DEA007B2BFC /* BugsnagBreadcrumbsTest.m */; };
+		8A4C96F41BAA2EC9007B2BFC /* BugsnagBreadcrumb.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A4C96F21BAA2EC9007B2BFC /* BugsnagBreadcrumb.h */; };
+		8A4C96F51BAA2EC9007B2BFC /* BugsnagBreadcrumb.m in Sources */ = {isa = PBXBuildFile; fileRef = 8A4C96F31BAA2EC9007B2BFC /* BugsnagBreadcrumb.m */; };
+		8A4C96F61BAA2EC9007B2BFC /* BugsnagBreadcrumb.m in Sources */ = {isa = PBXBuildFile; fileRef = 8A4C96F31BAA2EC9007B2BFC /* BugsnagBreadcrumb.m */; };
+		8A4C96F81BAA2EDA007B2BFC /* BugsnagBreadcrumb.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A4C96F21BAA2EC9007B2BFC /* BugsnagBreadcrumb.h */; };
+		8A4C96F91BAA2EDD007B2BFC /* BugsnagBreadcrumb.m in Sources */ = {isa = PBXBuildFile; fileRef = 8A4C96F31BAA2EC9007B2BFC /* BugsnagBreadcrumb.m */; };
+		8AAF53001C653DF500CDFF50 /* BugsnagOSX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 932642CB1AB2494F0006C447 /* BugsnagOSX.framework */; };
+		8AAF53061C653E0100CDFF50 /* BugsnagBreadcrumbsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 8A4C96F01BAA2DEA007B2BFC /* BugsnagBreadcrumbsTest.m */; };
+		8AAF53071C653E0400CDFF50 /* BugsnagCrashReportTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 938595BC1A2D52400082E445 /* BugsnagCrashReportTests.m */; };
+		8AAF53081C653E0700CDFF50 /* BugsnagSinkTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 938595BA1A2D51FE0082E445 /* BugsnagSinkTests.m */; };
+		8AAF53091C653E0A00CDFF50 /* BugsnagTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 79FD0E281A0C18F30050DBC5 /* BugsnagTests.m */; };
+		8AAF530A1C6541E600CDFF50 /* report.json in Resources */ = {isa = PBXBuildFile; fileRef = 938595BE1A2D54D40082E445 /* report.json */; };
 		932642E41AB249650006C447 /* KSCrashC.c in Sources */ = {isa = PBXBuildFile; fileRef = 79FD0D731A0C16C70050DBC5 /* KSCrashC.c */; };
 		932642E51AB249650006C447 /* KSCrashReport.c in Sources */ = {isa = PBXBuildFile; fileRef = 79FD0D781A0C16C70050DBC5 /* KSCrashReport.c */; };
 		932642E61AB249650006C447 /* KSCrashState.c in Sources */ = {isa = PBXBuildFile; fileRef = 79FD0D7E1A0C16C70050DBC5 /* KSCrashState.c */; };
@@ -174,6 +180,13 @@
 			remoteGlobalIDString = 79FD0D1E1A0C151E0050DBC5;
 			remoteInfo = "Bugsnag-Simulator";
 		};
+		8AAF53011C653DF500CDFF50 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 79659E111A0AFFF800280978 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 932642CA1AB2494F0006C447;
+			remoteInfo = BugsnagOSX;
+		};
 		9385968A1A2EB7580082E445 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 79659E111A0AFFF800280978 /* Project object */;
@@ -311,6 +324,8 @@
 		8A4C96F01BAA2DEA007B2BFC /* BugsnagBreadcrumbsTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BugsnagBreadcrumbsTest.m; sourceTree = "<group>"; };
 		8A4C96F21BAA2EC9007B2BFC /* BugsnagBreadcrumb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BugsnagBreadcrumb.h; path = Source/Bugsnag/BugsnagBreadcrumb.h; sourceTree = "<group>"; };
 		8A4C96F31BAA2EC9007B2BFC /* BugsnagBreadcrumb.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BugsnagBreadcrumb.m; path = Source/Bugsnag/BugsnagBreadcrumb.m; sourceTree = "<group>"; };
+		8AAF52FB1C653DF500CDFF50 /* BugsnagOSXTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BugsnagOSXTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		8AAF52FF1C653DF500CDFF50 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		932642CB1AB2494F0006C447 /* BugsnagOSX.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = BugsnagOSX.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		9326431D1AB24D820006C447 /* BugsnagOSXNotifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BugsnagOSXNotifier.h; path = Source/Bugsnag/BugsnagOSXNotifier.h; sourceTree = "<group>"; };
 		9326431E1AB24D820006C447 /* BugsnagOSXNotifier.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BugsnagOSXNotifier.m; path = Source/Bugsnag/BugsnagOSXNotifier.m; sourceTree = "<group>"; };
@@ -354,6 +369,14 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		8AAF52F81C653DF500CDFF50 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				8AAF53001C653DF500CDFF50 /* BugsnagOSX.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		932642C71AB2494F0006C447 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -385,6 +408,7 @@
 				79FD0E171A0C18F30050DBC5 /* Bugsnag.framework */,
 				79FD0E211A0C18F30050DBC5 /* BugsnagTests.xctest */,
 				932642CB1AB2494F0006C447 /* BugsnagOSX.framework */,
+				8AAF52FB1C653DF500CDFF50 /* BugsnagOSXTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -562,11 +586,29 @@
 			isa = PBXGroup;
 			children = (
 				938595BE1A2D54D40082E445 /* report.json */,
-				79FD0E271A0C18F30050DBC5 /* Info.plist */,
+				8AAF530B1C655F7100CDFF50 /* iOS */,
+				8AAF52FC1C653DF500CDFF50 /* OS X */,
 			);
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
+		8AAF52FC1C653DF500CDFF50 /* OS X */ = {
+			isa = PBXGroup;
+			children = (
+				8AAF52FF1C653DF500CDFF50 /* Info.plist */,
+			);
+			name = "OS X";
+			path = ../BugsnagOSXTests;
+			sourceTree = "<group>";
+		};
+		8AAF530B1C655F7100CDFF50 /* iOS */ = {
+			isa = PBXGroup;
+			children = (
+				79FD0E271A0C18F30050DBC5 /* Info.plist */,
+			);
+			name = iOS;
+			sourceTree = "<group>";
+		};
 		9326431C1AB24D680006C447 /* BugsnagOSX */ = {
 			isa = PBXGroup;
 			children = (
@@ -677,6 +719,24 @@
 			productReference = 79FD0E211A0C18F30050DBC5 /* BugsnagTests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
+		8AAF52FA1C653DF500CDFF50 /* BugsnagOSXTests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 8AAF53051C653DF500CDFF50 /* Build configuration list for PBXNativeTarget "BugsnagOSXTests" */;
+			buildPhases = (
+				8AAF52F71C653DF500CDFF50 /* Sources */,
+				8AAF52F81C653DF500CDFF50 /* Frameworks */,
+				8AAF52F91C653DF500CDFF50 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				8AAF53021C653DF500CDFF50 /* PBXTargetDependency */,
+			);
+			name = BugsnagOSXTests;
+			productName = BugsnagOSXTests;
+			productReference = 8AAF52FB1C653DF500CDFF50 /* BugsnagOSXTests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
 		932642CA1AB2494F0006C447 /* BugsnagOSX */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 932642DE1AB2494F0006C447 /* Build configuration list for PBXNativeTarget "BugsnagOSX" */;
@@ -716,6 +776,9 @@
 						CreatedOnToolsVersion = 6.1;
 						DevelopmentTeam = 372ZUL2ZB7;
 					};
+					8AAF52FA1C653DF500CDFF50 = {
+						CreatedOnToolsVersion = 7.2.1;
+					};
 					932642CA1AB2494F0006C447 = {
 						CreatedOnToolsVersion = 6.2;
 						DevelopmentTeam = 372ZUL2ZB7;
@@ -739,6 +802,7 @@
 				79FD0E161A0C18F30050DBC5 /* Bugsnag */,
 				79FD0E201A0C18F30050DBC5 /* BugsnagTests */,
 				932642CA1AB2494F0006C447 /* BugsnagOSX */,
+				8AAF52FA1C653DF500CDFF50 /* BugsnagOSXTests */,
 			);
 		};
 /* End PBXProject section */
@@ -759,6 +823,14 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		8AAF52F91C653DF500CDFF50 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				8AAF530A1C6541E600CDFF50 /* report.json in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		932642C91AB2494F0006C447 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -909,6 +981,17 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		8AAF52F71C653DF500CDFF50 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				8AAF53081C653E0700CDFF50 /* BugsnagSinkTests.m in Sources */,
+				8AAF53061C653E0100CDFF50 /* BugsnagBreadcrumbsTest.m in Sources */,
+				8AAF53071C653E0400CDFF50 /* BugsnagCrashReportTests.m in Sources */,
+				8AAF53091C653E0A00CDFF50 /* BugsnagTests.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		932642C61AB2494F0006C447 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -974,6 +1057,11 @@
 			target = 79FD0D1E1A0C151E0050DBC5 /* Bugsnag-Simulator */;
 			targetProxy = 79FD0E351A0C1ABF0050DBC5 /* PBXContainerItemProxy */;
 		};
+		8AAF53021C653DF500CDFF50 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 932642CA1AB2494F0006C447 /* BugsnagOSX */;
+			targetProxy = 8AAF53011C653DF500CDFF50 /* PBXContainerItemProxy */;
+		};
 		9385968B1A2EB7580082E445 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 79FD0E161A0C18F30050DBC5 /* Bugsnag */;
@@ -1299,8 +1387,7 @@
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "";
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1355,8 +1442,7 @@
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "";
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1388,6 +1474,95 @@
 			};
 			name = Release;
 		};
+		8AAF53031C653DF500CDFF50 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "";
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				INFOPLIST_FILE = BugsnagOSXTests/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = com.bugsnag.BugsnagOSXTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		8AAF53041C653DF500CDFF50 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "";
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				INFOPLIST_FILE = BugsnagOSXTests/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				PRODUCT_BUNDLE_IDENTIFIER = com.bugsnag.BugsnagOSXTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
 		932642DF1AB2494F0006C447 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -1548,6 +1723,15 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		8AAF53051C653DF500CDFF50 /* Build configuration list for PBXNativeTarget "BugsnagOSXTests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				8AAF53031C653DF500CDFF50 /* Debug */,
+				8AAF53041C653DF500CDFF50 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		932642DE1AB2494F0006C447 /* Build configuration list for PBXNativeTarget "BugsnagOSX" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
diff --git a/Bugsnag.xcodeproj/xcshareddata/xcschemes/BugsnagOSX.xcscheme b/Bugsnag.xcodeproj/xcshareddata/xcschemes/BugsnagOSX.xcscheme
new file mode 100644
index 000000000..f72dfe83f
--- /dev/null
+++ b/Bugsnag.xcodeproj/xcshareddata/xcschemes/BugsnagOSX.xcscheme
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0710"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "932642CA1AB2494F0006C447"
+               BuildableName = "BugsnagOSX.framework"
+               BlueprintName = "BugsnagOSX"
+               ReferencedContainer = "container:Bugsnag.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "8AAF52FA1C653DF500CDFF50"
+               BuildableName = "BugsnagOSXTests.xctest"
+               BlueprintName = "BugsnagOSXTests"
+               ReferencedContainer = "container:Bugsnag.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "932642CA1AB2494F0006C447"
+            BuildableName = "BugsnagOSX.framework"
+            BlueprintName = "BugsnagOSX"
+            ReferencedContainer = "container:Bugsnag.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "932642CA1AB2494F0006C447"
+            BuildableName = "BugsnagOSX.framework"
+            BlueprintName = "BugsnagOSX"
+            ReferencedContainer = "container:Bugsnag.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "932642CA1AB2494F0006C447"
+            BuildableName = "BugsnagOSX.framework"
+            BlueprintName = "BugsnagOSX"
+            ReferencedContainer = "container:Bugsnag.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/BugsnagOSXTests/Info.plist b/BugsnagOSXTests/Info.plist
new file mode 100644
index 000000000..ba72822e8
--- /dev/null
+++ b/BugsnagOSXTests/Info.plist
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/BugsnagTests/BugsnagSinkTests.m b/BugsnagTests/BugsnagSinkTests.m
index d8d844baa..9165fcf61 100644
--- a/BugsnagTests/BugsnagSinkTests.m
+++ b/BugsnagTests/BugsnagSinkTests.m
@@ -42,6 +42,7 @@ - (void)setUp {
   config.autoNotify = NO;
   config.apiKey = @"apiKeyHere";
   config.releaseStage = @"MagicalTestingTime";
+  config.notifyURL = nil;
   [Bugsnag startBugsnagWithConfiguration:config];
 }
 
@@ -74,7 +75,11 @@ - (void)testCorrectNotifierKeys {
 
 - (void)testNotifierName {
   NSString *name = self.processedData[@"notifier"][@"name"];
+#if TARGET_IPHONE_SIMULATOR || TARGET_OS_IPHONE
   XCTAssertEqualObjects(name, @"iOS Bugsnag Notifier");
+#else
+  XCTAssertEqualObjects(name, @"OSX Bugsnag Notifier");
+#endif
 }
 
 - (void)testNotifierDefaultURL {
diff --git a/BugsnagTests/BugsnagTests.m b/BugsnagTests/BugsnagTests.m
index 690f63b1e..2cd4c564e 100644
--- a/BugsnagTests/BugsnagTests.m
+++ b/BugsnagTests/BugsnagTests.m
@@ -7,7 +7,7 @@
 //
 
 #import "Bugsnag.h"
-#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
 #import <XCTest/XCTest.h>
 
 @interface BugsnagTests : XCTestCase
diff --git a/Makefile b/Makefile
index 034e9b42c..b7339e185 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,8 @@
-ifeq ($(IPHONE_SDK),)
- IPHONE_SDK=iphonesimulator9.2
+ifeq ($(SDK),)
+ SDK=iphonesimulator9.2
 endif
-BUILD_FLAGS=-project Bugsnag.xcodeproj -scheme Bugsnag -sdk $(IPHONE_SDK) -destination "platform=iOS Simulator,name=iPhone 5" -configuration Debug
+IOS_BUILD_FLAGS=-project Bugsnag.xcodeproj -scheme Bugsnag -sdk $(SDK) -destination "platform=iOS Simulator,name=iPhone 5" -configuration Debug
+OSX_BUILD_FLAGS=-project Bugsnag.xcodeproj -scheme BugsnagOSX CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
 XCODEBUILD=set -o pipefail && xcodebuild
 VERSION=$(shell cat VERSION)
 ifneq ($(strip $(shell which xcpretty)),)
@@ -23,14 +24,24 @@ bootstrap:
 	@gem install xcpretty --quiet --no-ri --no-rdoc
 
 build:
-	$(XCODEBUILD) $(BUILD_FLAGS) build $(FORMATTER)
+	$(XCODEBUILD) $(IOS_BUILD_FLAGS) build $(FORMATTER)
 
 clean:
-	$(XCODEBUILD) $(BUILD_FLAGS) clean $(FORMATTER)
+	$(XCODEBUILD) $(IOS_BUILD_FLAGS) clean $(FORMATTER)
 	@rm -r build
 
 test:
-	$(XCODEBUILD) $(BUILD_FLAGS) test $(FORMATTER)
+ifeq ($(BUILD_OSX), 1)
+	@$(MAKE) test-osx
+else
+	@$(MAKE) test-ios
+endif
+
+test-ios:
+	$(XCODEBUILD) $(IOS_BUILD_FLAGS) test $(FORMATTER)
+
+test-osx:
+	$(XCODEBUILD) $(OSX_BUILD_FLAGS) test $(FORMATTER)
 
 release: build/Release/Bugsnag-$(VERSION).zip build/Release/BugsnagOSX-$(VERSION).zip
 	@open .