diff --git a/tests/image.bats b/tests/image.bats
index 66fb0ed..0731294 100644
--- a/tests/image.bats
+++ b/tests/image.bats
@@ -3,22 +3,27 @@
 load ../common
 
 @test "Shibd binary available" {
-  docker run -i $maintainer/$imagename find /usr/sbin/shibd
+  docker run -i ${imagename}_${tag} find /usr/sbin/shibd
+  docker run -i ${imagename}_${tag}:arm64 find /usr/sbin/shibd
 }
 
 @test "Shibboleth root available" {
-  docker run -i $maintainer/$imagename find /etc/shibboleth
+  docker run -i ${imagename}_${tag} find /etc/shibboleth
+  docker run -i ${imagename}_${tag}:arm64 find /etc/shibboleth
 }
 
 @test "Sample attribute map available" {
-  docker run -i $maintainer/$imagename find /etc/shibboleth/attribute-map.xml
+  docker run -i ${imagename}_${tag} find /etc/shibboleth/attribute-map.xml
+  docker run -i ${imagename}_${tag}:arm64 find /etc/shibboleth/attribute-map.xml
 }
 
 @test "Includes InCommon cert" {
-  docker run -i $maintainer/$imagename find /etc/shibboleth/inc-md-cert.pem
+  docker run -i ${imagename}_${tag} find /etc/shibboleth/inc-md-cert.pem
+  docker run -i ${imagename}_${tag}:arm64 find /etc/shibboleth/inc-md-cert.pem
 }
 
 @test "Includes startup script" {
-  docker run -i $maintainer/$imagename find /usr/local/bin/startup.sh
+  docker run -i ${imagename}_${tag} find /usr/local/bin/startup.sh
+  docker run -i ${imagename}_${tag}:arm64 find /usr/local/bin/startup.sh
 }
 
diff --git a/tests/running.bats b/tests/running.bats
deleted file mode 100644
index 781715b..0000000
--- a/tests/running.bats
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env bats
-
-load ../common
-
-# These tests assume the pipeline will start and stop the container.
-
-@test "Leaves running process" {
-  result="$(docker ps | grep $imagename)"
-  [ "$result" != '' ]
-}
-
-@test "Exposes running HTTP service" {
-  result="$(docker exec -i $imagename curl http://localhost/)"
-  [ "$result" != '' ]
-}
-
-@test "Exposes running SSO process" {
-  result="$(docker exec -i $imagename curl http://localhost/Shibboleth.sso/Status)"
-  [ "$result" != '' ]
-}
-