diff --git a/Dockerfile b/Dockerfile
index 7cef8e8..56a5de7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,7 +32,7 @@ ENV SHIB_RELDIR=http://shibboleth.net/downloads/identity-provider/$VERSION
 ENV SHIB_PREFIX=shibboleth-identity-provider-$VERSION
 
 RUN mkdir -p /tmp/shibboleth && cd /tmp/shibboleth && \
-      wget https://shibboleth.net/downloads/PGP_KEYS \
+      wget -q https://shibboleth.net/downloads/PGP_KEYS \
            $SHIB_RELDIR/$SHIB_PREFIX.tar.gz \
            $SHIB_RELDIR/$SHIB_PREFIX.tar.gz.asc \
            $SHIB_RELDIR/$SHIB_PREFIX.tar.gz.sha256 && \
@@ -42,4 +42,5 @@ RUN mkdir -p /tmp/shibboleth && cd /tmp/shibboleth && \
            tar xf $SHIB_PREFIX.tar.gz && \
            mkdir -p /opt/shibboleth && \
            mv $SHIB_PREFIX /opt/shibboleth/. && \
-           ln -s /opt/shibboleth/$SHIB_PREFIX /opt/shibboleth/current
\ No newline at end of file
+           ln -s /opt/shibboleth/$SHIB_PREFIX /opt/shibboleth/current && \
+           rm -rf /tmp/shibboleth
\ No newline at end of file
diff --git a/bin/run.sh b/bin/run.sh
index 3509fb8..8af1b06 100755
--- a/bin/run.sh
+++ b/bin/run.sh
@@ -2,4 +2,4 @@
 
 source common.bash .
 
-docker run $maintainer/$imagename
\ No newline at end of file
+docker run -it $maintainer/$imagename $1
\ No newline at end of file
diff --git a/tests/shibboleth-idp.bats b/tests/shibboleth-idp.bats
index e2ae756..b448b40 100644
--- a/tests/shibboleth-idp.bats
+++ b/tests/shibboleth-idp.bats
@@ -5,4 +5,9 @@ load ../common
 @test "Creates non-root Shib IDP home" {
   result="$(docker run -it bigfleet/shibboleth_idp ls /opt/shibboleth/current/bin/)"
   [ "$result" != '' ]
+}
+
+@test "Retains first-run experience" {
+  result="$(docker run -it bigfleet/shibboleth_idp ls /tmp/firsttimerunning)"
+  [ "$result" != '' ]
 }
\ No newline at end of file