diff --git a/demo/shibboleth/tests/main.bats b/demo/shibboleth/tests/main.bats
index 06a01da..a480fdb 100755
--- a/demo/shibboleth/tests/main.bats
+++ b/demo/shibboleth/tests/main.bats
@@ -9,7 +9,9 @@ load ../../../library
 }
 
 @test "010 Initialize and start containers" {
-    docker-compose -f docker-compose-tests.yml build --pull
+    docker-compose -f docker-compose-tests.yml build --pull midpoint_data directory idp
+    # Sometimes the tier/midpoint:xyz is not yet in the repository, causing issues with --pull
+    docker-compose -f docker-compose-tests.yml build midpoint_server
     docker-compose -f docker-compose-tests.yml up -d
 }