diff --git a/Makefile b/Makefile
index 38ea7a2564..4d60ad4c8d 100644
--- a/Makefile
+++ b/Makefile
@@ -227,9 +227,9 @@ test/checkseccomp/checkseccomp: $(wildcard test/checkseccomp/*.go)
 test/testvol/testvol: $(wildcard test/testvol/*.go)
 	$(GOCMD) build $(BUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -o $@ ./test/testvol
 
-.PHONY: volume-plugin-test-image
+.PHONY: volume-plugin-test-img
 volume-plugin-test-img:
-	podman build -t quay.io/libpod/volume-plugin-test-img -f Containerfile-testvol .
+	podman build -t quay.io/libpod/volume-plugin-test-img:$$(date +%Y%m%d) -f ./test/testvol/Containerfile .
 
 .PHONY: test/goecho/goecho
 test/goecho/goecho: $(wildcard test/goecho/*.go)
diff --git a/Containerfile-testvol b/test/testvol/Containerfile
similarity index 100%
rename from Containerfile-testvol
rename to test/testvol/Containerfile