diff --git a/.drone.yml b/.drone.yml
index c34fe480b81..1a6246852fd 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -590,8 +590,8 @@ matrix:
     - TESTS: caldavtester-new-endpoint
     - TESTS: carddavtester-new-endpoint
     - TESTS: carddavtester-old-endpoint
-#    - TESTS: object-store
-#      OBJECT_STORE: s3
+    - TESTS: object-store
+      OBJECT_STORE: s3
     - TESTS: sqlite-php7.0-samba-native
     - TESTS: sqlite-php7.0-samba-non-native
     - TEST: memcache-memcached
diff --git a/tests/preseed-config.php b/tests/preseed-config.php
index 53579406472..28ebc289e73 100644
--- a/tests/preseed-config.php
+++ b/tests/preseed-config.php
@@ -30,7 +30,7 @@ if (getenv('OBJECT_STORE') === 's3') {
 			'autocreate' => true,
 			'key' => 'dummy',
 			'secret' => 'dummy',
-			'hostname' => 'localhost',
+			'hostname' => getenv('DRONE') === 'true' ? 'fake-s3' : 'localhost',
 			'port' => 4569,
 			'use_ssl' => false,
 			// required for some non amazon s3 implementations