diff --git a/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentKiller.java b/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentKiller.java
index 4e295d17aa4..0e4fde44d76 100644
--- a/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentKiller.java
+++ b/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentKiller.java
@@ -27,7 +27,6 @@ import io.druid.segment.loading.SegmentLoadingException;
 import io.druid.timeline.DataSegment;
 import org.jets3t.service.ServiceException;
 import org.jets3t.service.impl.rest.httpclient.RestS3Service;
-import org.jets3t.service.model.S3Object;
 
 import java.util.Map;
 
@@ -54,7 +53,7 @@ public class S3DataSegmentKiller implements DataSegmentKiller
       Map<String, Object> loadSpec = segment.getLoadSpec();
       String s3Bucket = MapUtils.getString(loadSpec, "bucket");
       String s3Path = MapUtils.getString(loadSpec, "key");
-      String s3DescriptorPath = s3Path.substring(0, s3Path.lastIndexOf("/")) + "/descriptor.json";
+      String s3DescriptorPath = S3Utils.descriptorPathForSegmentPath(s3Path);
 
       if (s3Client.isObjectInBucket(s3Bucket, s3Path)) {
         log.info("Removing index file[s3://%s/%s] from s3!", s3Bucket, s3Path);
diff --git a/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentMover.java b/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentMover.java
index 245cbab8a63..599e3dce463 100644
--- a/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentMover.java
+++ b/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentMover.java
@@ -56,7 +56,7 @@ public class S3DataSegmentMover implements DataSegmentMover
       Map<String, Object> loadSpec = segment.getLoadSpec();
       String s3Bucket = MapUtils.getString(loadSpec, "bucket");
       String s3Path = MapUtils.getString(loadSpec, "key");
-      String s3DescriptorPath = s3Path.substring(0, s3Path.lastIndexOf("/")) + "/descriptor.json";
+      String s3DescriptorPath = S3Utils.descriptorPathForSegmentPath(s3Path);
 
       final String s3ArchiveBucket = config.getArchiveBucket();
 
diff --git a/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentPusher.java b/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentPusher.java
index e8b1a99710f..a73ed4d42ac 100644
--- a/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentPusher.java
+++ b/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentPusher.java
@@ -90,8 +90,11 @@ public class S3DataSegmentPusher implements DataSegmentPusher
               S3Object toPush = new S3Object(zipOutFile);
 
               final String outputBucket = config.getBucket();
+              final String s3Path = outputKey + "/index.zip";
+              final String s3DescriptorPath = S3Utils.descriptorPathForSegmentPath(s3Path);
+
               toPush.setBucketName(outputBucket);
-              toPush.setKey(outputKey + "/index.zip");
+              toPush.setKey(s3Path);
               if (!config.getDisableAcl()) {
                 toPush.setAcl(AccessControlList.REST_CANNED_AUTHENTICATED_READ);
               }
@@ -116,7 +119,7 @@ public class S3DataSegmentPusher implements DataSegmentPusher
               Files.copy(ByteStreams.newInputStreamSupplier(jsonMapper.writeValueAsBytes(inSegment)), descriptorFile);
               S3Object descriptorObject = new S3Object(descriptorFile);
               descriptorObject.setBucketName(outputBucket);
-              descriptorObject.setKey(outputKey + "/descriptor.json");
+              descriptorObject.setKey(s3DescriptorPath);
               if (!config.getDisableAcl()) {
                 descriptorObject.setAcl(GSAccessControlList.REST_CANNED_BUCKET_OWNER_FULL_CONTROL);
               }
@@ -142,4 +145,4 @@ public class S3DataSegmentPusher implements DataSegmentPusher
       throw Throwables.propagate(e);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/s3-extensions/src/main/java/io/druid/storage/s3/S3Utils.java b/s3-extensions/src/main/java/io/druid/storage/s3/S3Utils.java
index 3ae7088d88f..a4764717c1d 100644
--- a/s3-extensions/src/main/java/io/druid/storage/s3/S3Utils.java
+++ b/s3-extensions/src/main/java/io/druid/storage/s3/S3Utils.java
@@ -96,4 +96,8 @@ public class S3Utils
     return true;
   }
 
+  public static String descriptorPathForSegmentPath(String s3Path)
+  {
+    return s3Path.substring(0, s3Path.lastIndexOf("/")) + "/descriptor.json";
+  }
 }