diff --git a/Makefile b/Makefile
index d23dfdd1e..4064ddf4f 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ SHELL=/bin/bash -o pipefail -o errexit
 
 WORKING_DIR = ./
 SCHEME = Signal
+XCODE_BUILD = xcrun xcodebuild -workspace $(SCHEME).xcworkspace -scheme $(SCHEME) -sdk iphonesimulator
 
 .PHONY: build test retest clean dependencies
 
@@ -32,6 +33,8 @@ test:
 clean:
 	cd $(WORKING_DIR) && \
 		rm -fr Carthage/Build && \
-		$(XCODE_BUILD) \
-			clean | xcpretty
+		$(XCODE_BUILD) clean | xcpretty
 
+# Migrating across swift versions requires me to run this sometimes
+clean_carthage_cache:
+	rm -fr ~/Library/Caches/org.carthage.CarthageKit/