diff --git a/tests/drone-wait-objectstore.sh b/tests/drone-wait-objectstore.sh
index 228accc3da..7914d45bed 100755
--- a/tests/drone-wait-objectstore.sh
+++ b/tests/drone-wait-objectstore.sh
@@ -44,6 +44,7 @@ if [ "$OBJECT_STORE" == "swift" ]; then
 
     echo "creating test file"
 
+    i=0
     while [ 1 ]
     do
         sleep 2
@@ -54,6 +55,12 @@ if [ "$OBJECT_STORE" == "swift" ]; then
         then
             break
         fi
+
+        i=$((i + 1))
+        if [ "$i" == "20" ]
+        then
+            exit -1
+        fi
     done
 
     echo "deleting test file"