diff --git a/.travis.yml b/.travis.yml
index 4182f1425..939edc9ad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,7 @@ branches:
 env:
   global:
     - RENDERDOC_TRAVIS_BUILD=1 RENDERDOC_CI_BUILD=1
+    - secure: "nFkr8LnOvqAqgm/cMB2/4mxRaFBShUm5PBMkQf7cEa9p2yrATk5w2JQXAghr1szY2lnWxN/tLKc+93tKmTy7h9fg24VvfBkZIznI4b3m589lxSkrCWbEa3IplMdEHFl21iDSvyigheTUF4N4X2tEPNR5/mw0W+YQY8nXVekOgj9+1sC+ICdb6G6kLtrqNGFBr73KwJyZfl5j60JRvQauO5xLhbzGBDxYHzeo2QUk363czK0rxlZEmjWcqThx1AKmkYQGhHDIZ9ZcYv92nozdRjf2i5OBq5DBOp8FxCgQ225r8WRNFqH4ccGB2juQ+GtkLltUL7ZkyIY9z8zG7y9psG/ZrLvcnaDYsYnz6vaKBpy4RdaUZ1n9Le74yssGipEjOWOgUW3iuqp/1xkXIr7lEkY9MNLlWFtFgIQjDTeFS7QxsLovUcj/8OSHDNRs2fNegFhWUvv6nQUziq3nfDjm51W+VqNlSWKlq+NKr7ipvlpJcPEx7V5oe7SKoLQOGjj/ajTmKnnG653fQMOY4ACvkAfsu2+Vbs8C8VaUDvZRq9wg5cKmm3CrgmjO1r+lg07MA0EUCRtL3UwdxoaqbjpRKDAOdRA2r5dS/jAK1vt1RSuYaD4e6KtbdJgLVcHxT0/ABovs5yS40TSLQPA3Yvrd+76XFeGjkGdMtX2OTRasmTY="
 
 # variables for the matrix, which are implicitly unset if omitted
 #
@@ -53,3 +54,12 @@ install:
 
 script:
   - . ./util/travis/compile.sh
+
+deploy:
+  provider: script
+  skip_cleanup: true
+  script: bash $TRAVIS_BUILD_DIR/util/travis/osx_deploy.sh
+  on:
+    repo: baldurk/renderdoc
+    branch: ci-test
+    condition: $TRAVIS_OS_NAME = osx
diff --git a/util/travis/osx_compile.sh b/util/travis/osx_compile.sh
index dddaaae6f..8395d42e9 100755
--- a/util/travis/osx_compile.sh
+++ b/util/travis/osx_compile.sh
@@ -1,12 +1,13 @@
 #!/bin/sh
 
 mkdir build
-cd build
+pushd build
 cmake -DCMAKE_BUILD_TYPE=Debug ..
 make -j2
+popd # build
 
 echo "--- Running unit tests ---"
 
 trap 'exit' ERR
-./bin/renderdoccmd test unit
-./bin/qrenderdoc.app/Contents/MacOS/qrenderdoc --unittest
+./build/bin/renderdoccmd test unit
+./build/bin/qrenderdoc.app/Contents/MacOS/qrenderdoc --unittest
diff --git a/util/travis/osx_deploy.sh b/util/travis/osx_deploy.sh
new file mode 100644
index 000000000..5881b04c5
--- /dev/null
+++ b/util/travis/osx_deploy.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set +v
+
+if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$APPLE_BUILD" == "1" ]]; then
+	echo "Uploading macOS build to make nightly builds"
+	FNAME="RenderDoc_macOS_"`git rev-parse HEAD`.zip
+	zip -r "${FNAME}" build/bin
+	ls -lh "${FNAME}"
+	lftp sftp://"${UPLOADLOCATION}" -e "cd upload; put ${FNAME}; bye"
+else
+	echo "Running OSX deploy on unexpected platform.";
+	exit 1;
+fi
diff --git a/util/travis/osx_setup.sh b/util/travis/osx_setup.sh
index b9d9e7d85..daa42419c 100755
--- a/util/travis/osx_setup.sh
+++ b/util/travis/osx_setup.sh
@@ -1,8 +1,10 @@
 #!/bin/sh
 
 brew update
-brew install qt5
+brew install qt5 lftp
 brew link qt5 --force
 brew upgrade python
 
+echo '|1|DQR5DTWgBz2JwdQs1G6KpjppcIE=|oxLDo2zhfkFZ+/gsTcnXI/vC8qs= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBObosfTSrCa11pDrmPxJ6zzNltDJls3Vc0AMVrqX0hAGFoFWbGvdDm3wpDBYHpkL9LmG6bJNHqWmO59oUJZYl9E=' >> $HOME/.ssh/known_hosts
+
 echo "Setup complete"