[test_leauto_upgrades] actually use everything from v0.1.0 for setup
diff --git a/tests/letstest/multitester.py b/tests/letstest/multitester.py
index dee6968c3f8..19a6aad1ae7 100644
--- a/tests/letstest/multitester.py
+++ b/tests/letstest/multitester.py
@@ -139,7 +139,15 @@ def make_instance(instance_name,
     time.sleep(1.0)
 
     # give instance a name
-    new_instance.create_tags(Tags=[{'Key': 'Name', 'Value': instance_name}])
+    try:
+        new_instance.create_tags(Tags=[{'Key': 'Name', 'Value': instance_name}])
+    except botocore.exceptions.ClientError, e:
+        if "InvalidInstanceID.NotFound" in str(e):
+            # This seems to be ephemeral... retry
+            time.sleep(1)
+            new_instance.create_tags(Tags=[{'Key': 'Name', 'Value': instance_name}])
+        else:
+            raise
     return new_instance
 
 def terminate_and_clean(instances):
diff --git a/tests/letstest/scripts/test_leauto_upgrades.sh b/tests/letstest/scripts/test_leauto_upgrades.sh
index 262839ab173..0ad0d608167 100755
--- a/tests/letstest/scripts/test_leauto_upgrades.sh
+++ b/tests/letstest/scripts/test_leauto_upgrades.sh
@@ -8,12 +8,28 @@ cd letsencrypt
 SAVE="$PIP_EXTRA_INDEX_URL"
 unset PIP_EXTRA_INDEX_URL
 export PIP_INDEX_URL="https://isnot.org/pip/0.1.0/"
-./letsencrypt-auto -v --debug --version 
+
+#OLD_LEAUTO="https://raw.githubusercontent.com/letsencrypt/letsencrypt/5747ab7fd9641986833bad474d71b46a8c589247/letsencrypt-auto"
+
+
+if ! command -v git ; then
+    if [ "$OS_TYPE" = "ubuntu" ] ; then
+        sudo apt-get update
+    fi
+    if ! (  sudo apt-get install -y git || sudo yum install -y git-all || sudo yum install -y git || sudo dnf install -y git ) ; then
+        echo git installation failed!
+        exit 1
+    fi
+fi
+BRANCH=`git rev-parse --abbrev-ref HEAD`
+git checkout v0.1.0
+./letsencrypt-auto -v --debug --version
 unset PIP_INDEX_URL
 
 export PIP_EXTRA_INDEX_URL="$SAVE"
 
-if ! ./letsencrypt-auto -v --debug --version | grep 0.2.0 ; then
+git checkout -f "$BRANCH"
+if ! ./letsencrypt-auto -v --debug --version | grep 0.3.0 ; then
     echo upgrade appeared to fail
     exit 1
 fi

This would catch issues like #2243 in test farm testing.
