diff --git a/tests/main.bats b/tests/main.bats
index 98690b5..aad6cbd 100644
--- a/tests/main.bats
+++ b/tests/main.bats
@@ -3,11 +3,11 @@
 load ../common
 
 @test "010 Image is present and healthy" {
-    docker image inspect ${maintainer}/${imagename}:${tag}
+    docker image inspect ${maintainer}/${imagename}
 }
 
 @test "020 All key files are present" {
-    docker run --rm -i ${maintainer}/${imagename}:${tag} \
+    docker run --rm -i ${maintainer}/${imagename} \
 	find \
 		/opt/shibboleth-idp/credentials/idp-encryption.crt \
 		/opt/shibboleth-idp/credentials/idp-encryption.key \
@@ -18,10 +18,10 @@ load ../common
 }
 
 @test "030 Port 443/https is listening" {
-    docker run -d ${maintainer}/${imagename}:${tag}
+    docker run -d ${maintainer}/${imagename}
     sleep 25
     #get cont id
-    contid=$(docker ps | grep ${maintainer}/${imagename}:${tag} | cut -f 1 -d ' ')
+    contid=$(docker ps | grep ${maintainer}/${imagename} | cut -f 1 -d ' ')
     run docker exec -i ${contid} sh -c 'cat < /dev/null > /dev/tcp/127.0.0.1/443'
     docker kill ${contid} &>/dev/null
     docker rm ${contid} &>/dev/null
@@ -29,9 +29,9 @@ load ../common
 }
 
 @test "040 The IdP Status page is present" {
-    docker run -d ${maintainer}/${imagename}:${tag}
+    docker run -d ${maintainer}/${imagename}
     sleep 60
-    contid2=$(docker ps | grep ${maintainer}/${imagename}:${tag} | cut -f 1 -d ' ')
+    contid2=$(docker ps | grep ${maintainer}/${imagename} | cut -f 1 -d ' ')
     run docker exec -i ${contid2} sh -c 'curl -I -k -s -f https://127.0.0.1/idp/status'
     docker kill ${contid2} &>/dev/null
     docker rm ${contid2} &>/dev/null
@@ -39,11 +39,11 @@ load ../common
 }
 
 @test "050 The version of Tomcat is current" {
-    ./checktomcatver.sh ${maintainer}/${imagename}:${tag}
+    ./checktomcatver.sh ${maintainer}/${imagename}
 }
 
 @test "060 The version of the IdP is current" {
-    ./checkidpver.sh ${maintainer}/${imagename}:${tag}
+    ./checkidpver.sh ${maintainer}/${imagename}
 }
 
 @test "070 There are no known security vulnerabilities" {
@@ -55,7 +55,7 @@ load ../common
     sleep 15
     docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.5
     sleep 30
-    ./clair-scanner --ip 172.17.0.1 ${maintainer}/${imagename}:${tag}
+    ./clair-scanner --ip 172.17.0.1 ${maintainer}/${imagename}
     docker kill clair
     docker rm clair
     docker kill db