diff --git a/tools/configure_tempest.sh b/tools/configure_tempest.sh
index 6493822e49..9b543ab0d1 100755
--- a/tools/configure_tempest.sh
+++ b/tools/configure_tempest.sh
@@ -209,6 +209,21 @@ VOLUME_CATALOG_TYPE=volume
 LIVE_MIGRATION_AVAILABLE=${LIVE_MIGRATION_AVAILABLE:-False}
 USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION=${USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION:-False}
 
+# EC2 and S3 test configuration
+BOTO_EC2_URL="http://$IDENTITY_HOST:8773/services/Cloud"
+BOTO_S3_URL="http://$IDENTITY_HOST:3333"
+BOTO_AWS_ACCESS=""  # Created in tempest...
+BOTO_AWS_SECRET=""  # Created in tempest...
+BOTO_AWS_REGION="RegionOne"
+BOTO_S3_MATERIALS_PATH=$DEST/devstack/files/images/s3-materials/cirros-0.3.0
+BOTO_ARI_MANIFEST=cirros-0.3.0-x86_64-initrd.manifest.xml
+BOTO_AMI_MANIFEST=cirros-0.3.0-x86_64-blank.img.manifest.xml
+BOTO_AKI_MANIFEST=cirros-0.3.0-x86_64-vmlinuz.manifest.xml
+BOTO_FLAVOR_NAME=m1.tiny
+BOTO_SOCKET_TIMEOUT=5
+BOTO_BUILD_TIMEOUT=${COMPUTE_BUILD_TIMEOUT:-400}
+BOTO_BUILD_INTERVAL=${COMPUTE_BUILD_INTERVAL:-3}
+
 sed -e "
     s,%IDENTITY_USE_SSL%,$IDENTITY_USE_SSL,g;
     s,%IDENTITY_HOST%,$IDENTITY_HOST,g;
@@ -266,6 +281,19 @@ sed -e "
     s,%VOLUME_BUILD_TIMEOUT%,$VOLUME_BUILD_TIMEOUT,g;
     s,%LIVE_MIGRATION_AVAILABLE%,$LIVE_MIGRATION_AVAILABLE,g;
     s,%USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION%,$USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION,g;
+    s,%BOTO_EC2_URL%,$BOTO_EC2_URL,g;
+    s,%BOTO_S3_URL%,$BOTO_S3_URL,g;
+    s,%BOTO_AWS_ACCESS%,$BOTO_AWS_ACCESS,g;
+    s,%BOTO_AWS_SECRET%,$BOTO_AWS_SECRET,g;
+    s,%BOTO_AWS_REGION%,$BOTO_AWS_REGION,g;
+    s,%BOTO_S3_MATERIALS_PATH%,$BOTO_S3_MATERIALS_PATH,g;
+    s,%BOTO_ARI_MANIFEST%,$BOTO_ARI_MANIFEST,g;
+    s,%BOTO_AMI_MANIFEST%,$BOTO_AMI_MANIFEST,g;
+    s,%BOTO_AKI_MANIFEST%,$BOTO_AKI_MANIFEST,g;
+    s,%BOTO_FLAVOR_NAME%,$BOTO_FLAVOR_NAME,g;
+    s,%BOTO_SOCKET_TIMEOUT%,$BOTO_SOCKET_TIMEOUT,g;
+    s,%BOTO_BUILD_TIMEOUT%,$BOTO_BUILD_TIMEOUT,g;
+    s,%BOTO_BUILD_INTERVAL%,$BOTO_BUILD_INTERVAL,g;
 " -i $TEMPEST_CONF
 
 echo "Created tempest configuration file:"