diff --git a/awscli/Dockerfile b/awscli/Dockerfile
index 66ba0de..d0c3cd5 100644
--- a/awscli/Dockerfile
+++ b/awscli/Dockerfile
@@ -3,4 +3,6 @@ MAINTAINER Jessica Frazelle <jess@docker.com>
 
 RUN pip install awscli
 
+RUN mkdir -p /root/.aws && /bin/echo -e '[default]\noutput = json\nregion = $AMAZON_REGION\naws_access_key_id = $AMAZON_ACCESS_KEY_ID\naws_secret_access_key = $AMAZON_SECRET_ACCESS_KEY' > /root/.aws/config
+
 ENTRYPOINT [ "aws" ]
diff --git a/t/Dockerfile b/t/Dockerfile
new file mode 100644
index 0000000..88541ef
--- /dev/null
+++ b/t/Dockerfile
@@ -0,0 +1,6 @@
+FROM ruby:latest
+MAINTAINER Jessica Frazelle <jess@docker.com>
+
+RUN gem install t
+
+ENTRYPOINT [ "t" ]