diff --git a/registry/handlers/api_test.go b/registry/handlers/api_test.go
index 5fffaa5a..1f18173f 100644
--- a/registry/handlers/api_test.go
+++ b/registry/handlers/api_test.go
@@ -1378,19 +1378,28 @@ func testManifestAPISchema2(t *testing.T, env *testEnv, imageName reference.Name
 	}
 	defer resp.Body.Close()
 
-	checkResponse(t, "fetching uploaded manifest as schema1", resp, http.StatusOK)
-	checkHeaders(t, resp, http.Header{
-		"Docker-Content-Digest": []string{dgst.String()},
-		"ETag":                  []string{fmt.Sprintf(`"%s"`, dgst)},
-	})
-
-	var fetchedSchema1Manifest schema1.SignedManifest
-	dec = json.NewDecoder(resp.Body)
-
-	if err := dec.Decode(&fetchedSchema1Manifest); err != nil {
-		t.Fatalf("error decoding fetched schema1 manifest: %v", err)
+	manifestBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		t.Fatalf("error reading response body: %v", err)
 	}
 
+	checkResponse(t, "fetching uploaded manifest as schema1", resp, http.StatusOK)
+
+	m, desc, err := distribution.UnmarshalManifest(schema1.MediaTypeManifest, manifestBytes)
+	if err != nil {
+		t.Fatalf("unexpected error unmarshalling manifest: %v", err)
+	}
+
+	fetchedSchema1Manifest, ok := m.(*schema1.SignedManifest)
+	if !ok {
+		t.Fatalf("expecting schema1 manifest")
+	}
+
+	checkHeaders(t, resp, http.Header{
+		"Docker-Content-Digest": []string{desc.Digest.String()},
+		"ETag":                  []string{fmt.Sprintf(`"%s"`, desc.Digest)},
+	})
+
 	if fetchedSchema1Manifest.Manifest.SchemaVersion != 1 {
 		t.Fatal("wrong schema version")
 	}
@@ -1603,19 +1612,28 @@ func testManifestAPIManifestList(t *testing.T, env *testEnv, args manifestArgs)
 	}
 	defer resp.Body.Close()
 
-	checkResponse(t, "fetching uploaded manifest list as schema1", resp, http.StatusOK)
-	checkHeaders(t, resp, http.Header{
-		"Docker-Content-Digest": []string{dgst.String()},
-		"ETag":                  []string{fmt.Sprintf(`"%s"`, dgst)},
-	})
-
-	var fetchedSchema1Manifest schema1.SignedManifest
-	dec = json.NewDecoder(resp.Body)
-
-	if err := dec.Decode(&fetchedSchema1Manifest); err != nil {
-		t.Fatalf("error decoding fetched schema1 manifest: %v", err)
+	manifestBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		t.Fatalf("error reading response body: %v", err)
 	}
 
+	checkResponse(t, "fetching uploaded manifest list as schema1", resp, http.StatusOK)
+
+	m, desc, err := distribution.UnmarshalManifest(schema1.MediaTypeManifest, manifestBytes)
+	if err != nil {
+		t.Fatalf("unexpected error unmarshalling manifest: %v", err)
+	}
+
+	fetchedSchema1Manifest, ok := m.(*schema1.SignedManifest)
+	if !ok {
+		t.Fatalf("expecting schema1 manifest")
+	}
+
+	checkHeaders(t, resp, http.Header{
+		"Docker-Content-Digest": []string{desc.Digest.String()},
+		"ETag":                  []string{fmt.Sprintf(`"%s"`, desc.Digest)},
+	})
+
 	if fetchedSchema1Manifest.Manifest.SchemaVersion != 1 {
 		t.Fatal("wrong schema version")
 	}
diff --git a/registry/handlers/images.go b/registry/handlers/images.go
index b0c8f02e..f5c9eada 100644
--- a/registry/handlers/images.go
+++ b/registry/handlers/images.go
@@ -196,6 +196,7 @@ func (imh *imageManifestHandler) convertSchema2Manifest(schema2Manifest *schema2
 		imh.Errors = append(imh.Errors, v2.ErrorCodeManifestInvalid.WithDetail(err))
 		return nil, err
 	}
+	imh.Digest = digest.FromBytes(manifest.(*schema1.SignedManifest).Canonical)
 
 	return manifest, nil
 }