diff --git a/cmd/object-handlers.go b/cmd/object-handlers.go
index 3e2037ed2..7e423fd6c 100644
--- a/cmd/object-handlers.go
+++ b/cmd/object-handlers.go
@@ -25,7 +25,6 @@ import (
 	"path"
 	"sort"
 	"strconv"
-	"strings"
 
 	mux "github.com/gorilla/mux"
 )
@@ -874,8 +873,7 @@ func (api objectAPIHandlers) CompleteMultipartUploadHandler(w http.ResponseWrite
 	// Complete parts.
 	var completeParts []completePart
 	for _, part := range complMultipartUpload.Parts {
-		part.ETag = strings.TrimPrefix(part.ETag, "\"")
-		part.ETag = strings.TrimSuffix(part.ETag, "\"")
+		part.ETag = canonicalizeETag(part.ETag)
 		completeParts = append(completeParts, part)
 	}
 
diff --git a/cmd/object-handlers_test.go b/cmd/object-handlers_test.go
index 591477f63..feda6e29b 100644
--- a/cmd/object-handlers_test.go
+++ b/cmd/object-handlers_test.go
@@ -26,7 +26,6 @@ import (
 	"net/http/httptest"
 	"net/url"
 	"strconv"
-	"strings"
 	"sync"
 	"testing"
 
@@ -1037,7 +1036,7 @@ func testAPICopyObjectPartHandlerSanity(obj ObjectLayer, instanceType, bucketNam
 
 		parts = append(parts, completePart{
 			PartNumber: partNumber,
-			ETag:       strings.Trim(resp.ETag, "\""),
+			ETag:       canonicalizeETag(resp.ETag),
 		})
 	}
 
diff --git a/cmd/server_test.go b/cmd/server_test.go
index edfdcafa0..70fb9e6ce 100644
--- a/cmd/server_test.go
+++ b/cmd/server_test.go
@@ -2579,10 +2579,10 @@ func (s *TestSuiteCommon) TestObjectMultipart(c *C) {
 	c.Assert(response.StatusCode, Equals, http.StatusOK)
 	var parts []completePart
 	for _, part := range completeUploads.Parts {
-		part.ETag = strings.Trim(part.ETag, "\"")
+		part.ETag = canonicalizeETag(part.ETag)
 		parts = append(parts, part)
 	}
 	etag, err := getCompleteMultipartMD5(parts)
 	c.Assert(err, IsNil)
-	c.Assert(strings.Trim(response.Header.Get("Etag"), "\""), Equals, etag)
+	c.Assert(canonicalizeETag(response.Header.Get("Etag")), Equals, etag)
 }