diff --git a/Dockerfile b/Dockerfile
index 5e25e0deda..8dcd74d466 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -60,7 +60,7 @@ WORKDIR /go/src/github.com/docker/distribution
 # from the https://github.com/docker/distribution repository. This version of
 # the registry is used to test both schema 1 and schema 2 manifests. Generally,
 # the version specified here should match a current release.
-ARG REGISTRY_VERSION=v2.3.0
+ARG REGISTRY_VERSION=v2.8.2
 # REGISTRY_VERSION_SCHEMA1 specifies the version of the registry to build and
 # install from the https://github.com/docker/distribution repository. This is
 # an older (pre v2.3.0) version of the registry that only supports schema1
diff --git a/testutil/registry/registry.go b/testutil/registry/registry.go
index ad5a8153f7..7cc3370de4 100644
--- a/testutil/registry/registry.go
+++ b/testutil/registry/registry.go
@@ -107,10 +107,12 @@ http:
 	}
 
 	binary := V2binary
+	args := []string{"serve", confPath}
 	if c.schema1 {
 		binary = V2binarySchema1
+		args = []string{confPath}
 	}
-	cmd := exec.Command(binary, confPath)
+	cmd := exec.Command(binary, args...)
 	cmd.Stdout = c.stdout
 	cmd.Stderr = c.stderr
 	if err := cmd.Start(); err != nil {