diff --git a/Dockerfile b/Dockerfile
index 9e23514..3b3f1a0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-FROM bigfleet/shibboleth_sp
+FROM tier/shibboleth_sp
 
 # Define args and set a default value
 ARG registry=docker.io
diff --git a/tests/image.bats b/tests/image.bats
index c422091..616708f 100644
--- a/tests/image.bats
+++ b/tests/image.bats
@@ -19,3 +19,11 @@ load ../common
 @test "COmanage directory created" {
   docker run -i $maintainer/$imagename find /opt/comanage/comanage-registry-$version
 }
+
+@test "Autoexec firstrun capability detected" {
+  docker run -i $maintainer/$imagename find /opt/autoexec/bin/firstrun.sh
+}
+
+@test "Autoexec onbuild capability detected" {
+  docker run -i $maintainer/$imagename find /opt/autoexec/bin/onbuild.sh
+}