diff --git a/.drone.yml b/.drone.yml
index c20d4e5104..e266256fd3 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -2134,7 +2134,10 @@ steps:
 
 services:
 - name: fake-s3
-  image: lphoward/fake-s3:latest
+  image: minio/minio
+  environment:
+    MINIO_ACCESS_KEY: dummy
+    MINIO_SECRET_KEY: dummy
 
 trigger:
   branch:
diff --git a/tests/preseed-config.php b/tests/preseed-config.php
index 97c8a1d11a..5c9d8ab163 100644
--- a/tests/preseed-config.php
+++ b/tests/preseed-config.php
@@ -27,8 +27,8 @@ if (getenv('OBJECT_STORE') === 's3') {
 			'autocreate' => true,
 			'key' => 'dummy',
 			'secret' => 'dummy',
-			'hostname' => getenv('DRONE') === 'true' ? 'fake-s3' : 'localhost',
-			'port' => 4569,
+			'hostname' => getenv('DRONE') === 'true' ? 'minio' : 'localhost',
+			'port' => 9000,
 			'use_ssl' => false,
 			// required for some non amazon s3 implementations
 			'use_path_style' => true