diff --git a/.travis.yml b/.travis.yml
index 51a623aa8..6c0cf392b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,12 +12,5 @@ before_install:
 
 install: travis_wait 30 pod install # OpenSSL takes a long time to compile
 
-script:
-- |
-  set -o pipefail
-  # default xctool was hanging. see https://github.com/travis-ci/travis-ci/issues/3986
-  xcodebuild -workspace Signal.xcworkspace -scheme Signal \
-    -sdk iphonesimulator \
-    -destination 'platform=iOS Simulator,name=iPhone 6,OS=10.0' \
-    build test | xcpretty
+script: make
 
diff --git a/Makefile b/Makefile
new file mode 100644
index 000000000..8ef01cdc4
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,24 @@
+# Make sure we're failing even though we pipe to xcpretty
+SHELL=/bin/bash -o pipefail
+
+BUILD_PLATFORM=iOS Simulator,name=iPhone 6,OS=10.0
+WORKING_DIR = ./
+
+default: test
+
+build_signal:
+	cd $(WORKING_DIR) && \
+		pod install && \
+		xcodebuild -workspace Signal.xcworkspace -scheme Signal \
+		-sdk iphonesimulator \
+		build | xcpretty
+
+retest:
+	cd $(WORKING_DIR) && \
+	xcodebuild -workspace Signal.xcworkspace -scheme Signal \
+		-sdk iphonesimulator \
+		-destination 'platform=${BUILD_PLATFORM}' \
+		test | xcpretty
+
+test: build_signal retest
+