diff --git a/crypto/keys/doc.go b/crypto/keys/doc.go
deleted file mode 100644
index 681d888b89..0000000000
--- a/crypto/keys/doc.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 Google LLC. All Rights Reserved.
-//
-// 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.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package keys provides access to public and private keys for signing and verification of signatures.
-package keys
diff --git a/crypto/keys/handlers.go b/crypto/keys/handlers.go
index 3932c4057a..11634d6b8e 100644
--- a/crypto/keys/handlers.go
+++ b/crypto/keys/handlers.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// Package keys provides access to public and private keys for signing and verification of signatures.
 package keys
 
 import (
diff --git a/crypto/keys/pkcs11/doc.go b/crypto/keys/pkcs11/doc.go
deleted file mode 100644
index a0eccc57a0..0000000000
--- a/crypto/keys/pkcs11/doc.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 Google LLC. All Rights Reserved.
-//
-// 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.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package pkcs11 provides access to private keys using a PKCS#11 interface.
-package pkcs11
diff --git a/crypto/keys/pkcs11/pkcs11.go b/crypto/keys/pkcs11/pkcs11.go
index 23a8a595eb..23bcf7da01 100644
--- a/crypto/keys/pkcs11/pkcs11.go
+++ b/crypto/keys/pkcs11/pkcs11.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// Package pkcs11 provides access to private keys using a PKCS#11 interface.
 package pkcs11
 
 import (
diff --git a/crypto/keys/testonly/doc.go b/crypto/keys/testonly/doc.go
deleted file mode 100644
index 304e1971ca..0000000000
--- a/crypto/keys/testonly/doc.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2017 Google LLC. All Rights Reserved.
-//
-// 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.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-/*
-Package testonly contains code and data that should only be used by tests.
-Production code MUST NOT depend on anything in this package. This will be
-enforced by tools where possible.
-*/
-package testonly
diff --git a/crypto/keys/testonly/keys.go b/crypto/keys/testonly/keys.go
index be44a23399..ae3314bd50 100644
--- a/crypto/keys/testonly/keys.go
+++ b/crypto/keys/testonly/keys.go
@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// Package testonly contains code and data that should only be used by tests.
+// Production code MUST NOT depend on anything in this package. This will be
+// enforced by tools where possible.
 package testonly
 
 import (