diff --git a/distribution/pull_v2_test.go b/distribution/pull_v2_test.go
index eb1f7393fd..bcf56ace29 100644
--- a/distribution/pull_v2_test.go
+++ b/distribution/pull_v2_test.go
@@ -335,41 +335,27 @@ func testNewPuller(t *testing.T, rawurl string) *puller {
 	t.Helper()
 
 	uri, err := url.Parse(rawurl)
-	if err != nil {
-		t.Fatalf("could not parse url from test server: %v", err)
-	}
+	assert.NilError(t, err, "could not parse url from test server: %v", rawurl)
+
+	n, err := reference.ParseNormalizedNamed("testremotename")
+	assert.NilError(t, err)
 
-	endpoint := registry.APIEndpoint{
-		Mirror:       false,
-		URL:          uri,
-		Official:     false,
-		TrimHostname: false,
-		TLSConfig:    nil,
-	}
-	n, _ := reference.ParseNormalizedNamed("testremotename")
 	repoInfo := &registry.RepositoryInfo{
 		Name: n,
 		Index: &registrytypes.IndexInfo{
-			Name:     "testrepo",
-			Mirrors:  nil,
-			Secure:   false,
-			Official: false,
+			Name: "testrepo",
 		},
-		Official: false,
 	}
 	imagePullConfig := &ImagePullConfig{
 		Config: Config{
-			MetaHeaders: http.Header{},
 			AuthConfig: &registrytypes.AuthConfig{
 				RegistryToken: secretRegistryToken,
 			},
 		},
 	}
 
-	p := newPuller(endpoint, repoInfo, imagePullConfig, nil)
+	p := newPuller(registry.APIEndpoint{URL: uri}, repoInfo, imagePullConfig, nil)
 	p.repo, err = newRepository(context.Background(), p.repoInfo, p.endpoint, p.config.MetaHeaders, p.config.AuthConfig, "pull")
-	if err != nil {
-		t.Fatal(err)
-	}
+	assert.NilError(t, err)
 	return p
 }
diff --git a/distribution/registry_unit_test.go b/distribution/registry_unit_test.go
index 8de9861494..e34ed18b2c 100644
--- a/distribution/registry_unit_test.go
+++ b/distribution/registry_unit_test.go
@@ -41,22 +41,15 @@ func testTokenPassThru(t *testing.T, ts *httptest.Server) {
 	}
 
 	endpoint := registrypkg.APIEndpoint{
-		Mirror:       false,
 		URL:          uri,
-		Official:     false,
 		TrimHostname: false,
-		TLSConfig:    nil,
 	}
 	n, _ := reference.ParseNormalizedNamed("testremotename")
 	repoInfo := &registrypkg.RepositoryInfo{
 		Name: n,
 		Index: &registry.IndexInfo{
-			Name:     "testrepo",
-			Mirrors:  nil,
-			Secure:   false,
-			Official: false,
+			Name: "testrepo",
 		},
-		Official: false,
 	}
 	imagePullConfig := &ImagePullConfig{
 		Config: Config{