diff --git a/.gitmodules b/.gitmodules
index 68290399e..0a997a678 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -8,11 +8,15 @@
 	path = External/libssh2
 	url = git://git.libssh2.org/libssh2.git
 [submodule "Carthage.checkout/Nimble"]
-	path = Carthage.checkout/Nimble
+	path = Carthage/Checkouts/Nimble
 	url = https://github.com/Quick/Nimble.git
 [submodule "Carthage.checkout/Quick"]
-	path = Carthage.checkout/Quick
+	path = Carthage/Checkouts/Quick
 	url = https://github.com/Quick/Quick.git
 [submodule "Carthage.checkout/xcconfigs"]
-	path = Carthage.checkout/xcconfigs
+	path = Carthage/Checkouts/xcconfigs
 	url = https://github.com/jspahrsummers/xcconfigs.git
+[submodule "Carthage/Checkouts/Nimble"]
+	url = https://github.com/Quick/Nimble.git
+[submodule "Carthage/Checkouts/Quick"]
+	url = https://github.com/Quick/Quick.git
diff --git a/Cartfile b/Cartfile
index 12cd443b6..e69de29bb 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,3 +0,0 @@
-github "jspahrsummers/xcconfigs" >= 0.7
-github "Quick/Quick" == 0.2.0
-github "Quick/Nimble"
diff --git a/Cartfile.private b/Cartfile.private
new file mode 100644
index 000000000..2aeb82b42
--- /dev/null
+++ b/Cartfile.private
@@ -0,0 +1,3 @@
+github "jspahrsummers/xcconfigs" >= 0.7
+github "Quick/Quick" ~> 0.2
+github "Quick/Nimble" ~> 0.2
diff --git a/Cartfile.lock b/Cartfile.resolved
similarity index 70%
rename from Cartfile.lock
rename to Cartfile.resolved
index 9e34474e6..0961ae602 100644
--- a/Cartfile.lock
+++ b/Cartfile.resolved
@@ -1,3 +1,3 @@
 github "Quick/Nimble" "v0.2.0"
-github "Quick/Quick" "v0.2.0"
+github "Quick/Quick" "v0.2.2"
 github "jspahrsummers/xcconfigs" "0.7"
diff --git a/Carthage.checkout/Quick b/Carthage.checkout/Quick
deleted file mode 160000
index 315ae2a4a..000000000
--- a/Carthage.checkout/Quick
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 315ae2a4a630156d5ac094ae1f107af60edce21d
diff --git a/Carthage.checkout/Nimble b/Carthage/Checkouts/Nimble
similarity index 100%
rename from Carthage.checkout/Nimble
rename to Carthage/Checkouts/Nimble
diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick
new file mode 160000
index 000000000..b0e98286d
--- /dev/null
+++ b/Carthage/Checkouts/Quick
@@ -0,0 +1 @@
+Subproject commit b0e98286db7e9d1f1e73cd4e69eac2aae2a1e3f8
diff --git a/Carthage.checkout/xcconfigs b/Carthage/Checkouts/xcconfigs
similarity index 100%
rename from Carthage.checkout/xcconfigs
rename to Carthage/Checkouts/xcconfigs
diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj
index 3c5c6d39b..74bbf406c 100644
--- a/ObjectiveGitFramework.xcodeproj/project.pbxproj
+++ b/ObjectiveGitFramework.xcodeproj/project.pbxproj
@@ -905,7 +905,7 @@
 				D0D8186C174421EB00995A2E /* README.md */,
 			);
 			name = Configuration;
-			path = Carthage.checkout/xcconfigs;
+			path = Carthage/Checkouts/xcconfigs;
 			sourceTree = "<group>";
 		};
 		D0D81862174421EB00995A2E /* iOS */ = {
diff --git a/ObjectiveGitFramework.xcworkspace/contents.xcworkspacedata b/ObjectiveGitFramework.xcworkspace/contents.xcworkspacedata
index a72e4732c..522f3ee5b 100644
--- a/ObjectiveGitFramework.xcworkspace/contents.xcworkspacedata
+++ b/ObjectiveGitFramework.xcworkspace/contents.xcworkspacedata
@@ -5,9 +5,9 @@
       location = "group:ObjectiveGitFramework.xcodeproj">
    </FileRef>
    <FileRef
-      location = "group:Carthage.checkout/Nimble/Nimble.xcodeproj">
+      location = "group:Carthage/Checkouts/Nimble/Nimble.xcodeproj">
    </FileRef>
    <FileRef
-      location = "group:Carthage.checkout/Quick/Quick.xcodeproj">
+      location = "group:Carthage/Checkouts/Quick/Quick.xcodeproj">
    </FileRef>
 </Workspace>
diff --git a/ObjectiveGitTests/GTRemotePushSpec.m b/ObjectiveGitTests/GTRemotePushSpec.m
index f3b35bc20..844dc8b1a 100644
--- a/ObjectiveGitTests/GTRemotePushSpec.m
+++ b/ObjectiveGitTests/GTRemotePushSpec.m
@@ -164,7 +164,7 @@
 			BOOL success = NO;
 			GTBranch *localTrackingBranch = [masterBranch trackingBranchWithError:&error success:&success];
 			expect(error).to(beNil());
-			expect(@(success)).to(beTrue());
+			expect(@(success)).to(beTruthy());
 			expect(@([localTrackingBranch numberOfCommitsWithError:NULL])).to(equal(@3));
 
 			// Number of commits on remote before push
@@ -183,7 +183,7 @@
 			// Number of commits on tracking branch after push
 			localTrackingBranch = [masterBranch trackingBranchWithError:&error success:&success];
 			expect(error).to(beNil());
-			expect(@(success)).to(beTrue());
+			expect(@(success)).to(beTruthy());
 			expect(@([localTrackingBranch numberOfCommitsWithError:NULL])).to(equal(@4));
 
 			// Refresh remote master branch to ensure the commit count is accurate