diff --git a/contrib/fuzz/oss_fuzz_build.sh b/contrib/fuzz/oss_fuzz_build.sh
index f69620077..71e7bf1b2 100755
--- a/contrib/fuzz/oss_fuzz_build.sh
+++ b/contrib/fuzz/oss_fuzz_build.sh
@@ -54,7 +54,6 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
 cd ../../
 
 # Move all fuzzers that don't have the "fuzz" package out of this dir
-mv contrib/fuzz/docker_fuzzer.go remotes/docker/
 mv contrib/fuzz/container_fuzzer.go integration/client/
 
 rm -r vendor
diff --git a/contrib/fuzz/docker_fuzzer.go b/remotes/docker/fetcher_fuzz.go
similarity index 91%
rename from contrib/fuzz/docker_fuzzer.go
rename to remotes/docker/fetcher_fuzz.go
index 7f4213b78..e126ebbd8 100644
--- a/contrib/fuzz/docker_fuzzer.go
+++ b/remotes/docker/fetcher_fuzz.go
@@ -3,10 +3,13 @@
 
 /*
    Copyright The containerd Authors.
+
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
+
        http://www.apache.org/licenses/LICENSE-2.0
+
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,13 +17,6 @@
    limitations under the License.
 */
 
-/*
-   This fuzzer is run continuously by OSS-fuzz.
-   It is stored in contrib/fuzz for organization,
-   but in order to execute it, it must be moved to
-   remotes/docker first.
-*/
-
 package docker
 
 import (