diff --git a/.travis.yml b/.travis.yml
index 5ca2f52c0..7d03b64d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,11 +3,7 @@ script: cd tests && ./run_ec2 test
 before_install:
   - "sudo apt-get install -y ec2-api-tools"
   - "sudo apt-get install -y s3cmd"
-  - "sed --in-place \"s/access_key/access_key = $AWS_ACCESS_KEY/\" .s3cfg"
-  - "sed --in-place \"s|secret_key|secret_key = $AWS_SECRET_KEY|\" .s3cfg"
-  - "s3cmd -c .s3cfg get s3://progrium-private/ec2_cert.pem /tmp/cert"
-  - "s3cmd -c .s3cfg get s3://progrium-private/ec2_pk.pem /tmp/pk"
-  - "mkdir -p ~/.ssh && s3cmd -c .s3cfg get s3://progrium-private/test.pem ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa"
+  - "tests/setup_travis"
 env:
   global:
   - EC2_CERT=/tmp/cert
diff --git a/tests/run_ec2 b/tests/run_ec2
index 1dfaf9763..b16356a69 100755
--- a/tests/run_ec2
+++ b/tests/run_ec2
@@ -35,8 +35,8 @@ done
 echo "-----> Connecting and running boostrap script..."
 cat ../bootstrap.sh | ssh -o "StrictHostKeyChecking=no" ubuntu@$PUBLIC_IP "HOSTNAME=$PUBLIC_IP sudo bash" 2>&1 | indent
 echo "-----> Installing SSH public keys..."
-ssh-add -L | ssh -o "StrictHostKeyChecking=no" ubuntu@$PUBLIC_IP "sudo gitreceive upload-key test" > /dev/null
-ssh-add -L | ssh -o "StrictHostKeyChecking=no" ubuntu@$PUBLIC_IP "sudo sshcommand acl-add dokku test" > /dev/null
+cat ~/.ssh/id_rsa.pub | ssh -o "StrictHostKeyChecking=no" ubuntu@$PUBLIC_IP "sudo gitreceive upload-key test" > /dev/null
+cat ~/.ssh/id_rsa.pub | ssh -o "StrictHostKeyChecking=no" ubuntu@$PUBLIC_IP "sudo sshcommand acl-add dokku test" > /dev/null
 for app_path in apps/*; do
   app=$(basename $app_path)
   echo "-----> Running test deploy of $app..."
diff --git a/tests/setup_travis b/tests/setup_travis
new file mode 100755
index 000000000..bfa62c0e3
--- /dev/null
+++ b/tests/setup_travis
@@ -0,0 +1,9 @@
+#!/bin/bash
+sed --in-place "s|access_key|access_key = $AWS_ACCESS_KEY|" .s3cfg
+sed --in-place "s|secret_key|secret_key = $AWS_SECRET_KEY|" .s3cfg
+s3cmd -c .s3cfg get s3://progrium-private/ec2_cert.pem /tmp/cert
+s3cmd -c .s3cfg get s3://progrium-private/ec2_pk.pem /tmp/pk
+mkdir -p ~/.ssh
+s3cmd -c .s3cfg get s3://progrium-private/test.pem ~/.ssh/id_rsa
+chmod 600 ~/.ssh/id_rsa
+openssl rsa -in ~/.ssh/id_rsa -pubout > ~/.ssh/id_rsa.pub
\ No newline at end of file