diff --git a/Makefile b/Makefile
index 6f07fdd..326ecc0 100644
--- a/Makefile
+++ b/Makefile
@@ -32,11 +32,11 @@ test-all: test-x86 test-arm
 
 .PHONY: test-s3-x86
 test-s3-x86:
-	cd tests && ./test-s3.sh ubuntu
+	cd tests && ./test-s3.sh Dockerfile
 
 .PHONY: test-s3-arm
 test-s3-arm:
-	cd tests && ./test-s3.sh raspbian
+	cd tests && ./test-s3.sh Dockerfile.armhf
 
 .PHONY: test-s3-all
 test-s3-all: test-s3-x86 test-s3-arm
diff --git a/tests/docker-compose-test-s3.yml b/tests/docker-compose-test-s3.yml
index 24ba128..33d6125 100644
--- a/tests/docker-compose-test-s3.yml
+++ b/tests/docker-compose-test-s3.yml
@@ -3,7 +3,7 @@ services:
   duplicity:
     build:
       context: ..
-      dockerfile: Dockerfile.${DOCKER_BASE}
+      dockerfile: ${DOCKERFILE}
     entrypoint: "bash"
     command: ["/test.sh"]
     hostname: itest
diff --git a/tests/test-s3.sh b/tests/test-s3.sh
index 40cbdbc..7d056e5 100755
--- a/tests/test-s3.sh
+++ b/tests/test-s3.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-export DOCKER_BASE=$1
+export DOCKERFILE=$1
 
 docker-compose -f docker-compose-test-s3.yml up \
     --build --abort-on-container-exit --force-recreate