diff --git a/AxolotlKit Tests/AxolotlKit Tests-Info.plist b/AxolotlKit Tests/AxolotlKit Tests-Info.plist
index 556a0ca..169b6f7 100644
--- a/AxolotlKit Tests/AxolotlKit Tests-Info.plist	
+++ b/AxolotlKit Tests/AxolotlKit Tests-Info.plist	
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.fredericjacobs.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
diff --git a/AxolotlKit.xcodeproj/project.pbxproj b/AxolotlKit.xcodeproj/project.pbxproj
index 7216e3b..1e57b5c 100644
--- a/AxolotlKit.xcodeproj/project.pbxproj
+++ b/AxolotlKit.xcodeproj/project.pbxproj
@@ -537,7 +537,7 @@
 		B6B98F70197D838A00B16B5E /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0810;
+				LastUpgradeCheck = 0830;
 				ORGANIZATIONNAME = "Frederic Jacobs";
 				TargetAttributes = {
 					B63B2FDA197D8B9600E09F65 = {
@@ -775,6 +775,7 @@
 				);
 				INFOPLIST_FILE = "AxolotlKit/AxolotlKit-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				PRODUCT_BUNDLE_IDENTIFIER = org.whispersystems.SignalProtocolKitTestApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
@@ -791,6 +792,7 @@
 				GCC_PREFIX_HEADER = "AxolotlKit/AxolotlKit-Prefix.pch";
 				INFOPLIST_FILE = "AxolotlKit/AxolotlKit-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				PRODUCT_BUNDLE_IDENTIFIER = org.whispersystems.SignalProtocolKitTestApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
@@ -814,6 +816,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = "AxolotlKit Tests/AxolotlKit Tests-Info.plist";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.whispersystems.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AxolotlKit.app/AxolotlKit";
 				WRAPPER_EXTENSION = xctest;
@@ -834,6 +837,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "AxolotlKit Tests/AxolotlKit Tests-Prefix.pch";
 				INFOPLIST_FILE = "AxolotlKit Tests/AxolotlKit Tests-Info.plist";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.whispersystems.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AxolotlKit.app/AxolotlKit";
 				WRAPPER_EXTENSION = xctest;
diff --git a/AxolotlKit.xcodeproj/xcshareddata/xcschemes/AxolotlKit.xcscheme b/AxolotlKit.xcodeproj/xcshareddata/xcschemes/AxolotlKit.xcscheme
index 15296ff..d9489d9 100644
--- a/AxolotlKit.xcodeproj/xcshareddata/xcschemes/AxolotlKit.xcscheme
+++ b/AxolotlKit.xcodeproj/xcshareddata/xcschemes/AxolotlKit.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0810"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/AxolotlKit.xcodeproj/xcshareddata/xcschemes/AxolotlKitTests.xcscheme b/AxolotlKit.xcodeproj/xcshareddata/xcschemes/AxolotlKitTests.xcscheme
index 3a24fa1..007fd28 100644
--- a/AxolotlKit.xcodeproj/xcshareddata/xcschemes/AxolotlKitTests.xcscheme
+++ b/AxolotlKit.xcodeproj/xcshareddata/xcschemes/AxolotlKitTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0810"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/AxolotlKit/AxolotlKit-Info.plist b/AxolotlKit/AxolotlKit-Info.plist
index ddc596a..6a012bd 100644
--- a/AxolotlKit/AxolotlKit-Info.plist
+++ b/AxolotlKit/AxolotlKit-Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.fredericjacobs.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>