diff --git a/README.md b/README.md
index ce6d3de28..40971edd1 100644
--- a/README.md
+++ b/README.md
@@ -359,7 +359,7 @@ Please feel free to submit issues, fork the repository and send pull requests!
 
 When submitting an issue, we ask that you please include a complete test function that demonstrates the issue. Extra credit for those using Testify to write the test code that demonstrates it.
 
-Code generation is used. Look for `CODE GENERATED AUTOMATICALLY` at the top of some files. Run `go generate ./...` to update generated files.
+Code generation is used. Look for `Code generated` at the top of some files. Run `go generate ./...` to update generated files.
 
 We also chat on the [Gophers Slack](https://gophers.slack.com) group in the `#testify` and `#testify-dev` channels.
 
diff --git a/_codegen/main.go b/_codegen/main.go
index 079c3b575..a42fce53b 100644
--- a/_codegen/main.go
+++ b/_codegen/main.go
@@ -297,10 +297,7 @@ func (f *testFunc) CommentWithoutT(receiver string) string {
 	return strings.Replace(f.Comment(), search, replace, -1)
 }
 
-var headerTemplate = `/*
-* CODE GENERATED AUTOMATICALLY WITH github.com/stretchr/testify/_codegen
-* THIS FILE MUST NOT BE EDITED BY HAND
-*/
+var headerTemplate = `// Code generated by github.com/stretchr/testify/_codegen. DO NOT EDIT.
 
 package {{.Name}}
 
diff --git a/assert/assertion_format.go b/assert/assertion_format.go
index 7880b8f94..e07a92425 100644
--- a/assert/assertion_format.go
+++ b/assert/assertion_format.go
@@ -1,7 +1,4 @@
-/*
-* CODE GENERATED AUTOMATICALLY WITH github.com/stretchr/testify/_codegen
-* THIS FILE MUST NOT BE EDITED BY HAND
- */
+// Code generated by github.com/stretchr/testify/_codegen. DO NOT EDIT.
 
 package assert
 
diff --git a/assert/assertion_forward.go b/assert/assertion_forward.go
index 339515b8b..01f167e02 100644
--- a/assert/assertion_forward.go
+++ b/assert/assertion_forward.go
@@ -1,7 +1,4 @@
-/*
-* CODE GENERATED AUTOMATICALLY WITH github.com/stretchr/testify/_codegen
-* THIS FILE MUST NOT BE EDITED BY HAND
- */
+// Code generated by github.com/stretchr/testify/_codegen. DO NOT EDIT.
 
 package assert
 
diff --git a/require/require.go b/require/require.go
index 880853f5a..27070540e 100644
--- a/require/require.go
+++ b/require/require.go
@@ -1,7 +1,4 @@
-/*
-* CODE GENERATED AUTOMATICALLY WITH github.com/stretchr/testify/_codegen
-* THIS FILE MUST NOT BE EDITED BY HAND
- */
+// Code generated by github.com/stretchr/testify/_codegen. DO NOT EDIT.
 
 package require
 
diff --git a/require/require_forward.go b/require/require_forward.go
index 960bf6f2c..0de3948d7 100644
--- a/require/require_forward.go
+++ b/require/require_forward.go
@@ -1,7 +1,4 @@
-/*
-* CODE GENERATED AUTOMATICALLY WITH github.com/stretchr/testify/_codegen
-* THIS FILE MUST NOT BE EDITED BY HAND
- */
+// Code generated by github.com/stretchr/testify/_codegen. DO NOT EDIT.
 
 package require