diff --git a/assert/assertion_compare_can_convert.go b/assert/assertion_compare_can_convert.go
index 1838be3..4a5627c 100644
--- a/assert/assertion_compare_can_convert.go
+++ b/assert/assertion_compare_can_convert.go
@@ -1,5 +1,9 @@
 // +build go1.17
 
+// TODO: once support for Go 1.16 is dropped, this file can be
+//       merged/removed with assertion_compare_go1.17_test.go and
+//       assertion_compare_legacy.go
+
 package assert
 
 import "reflect"
diff --git a/assert/assertion_compare_go1.17_test.go b/assert/assertion_compare_go1.17_test.go
index 0511e64..bff219d 100644
--- a/assert/assertion_compare_go1.17_test.go
+++ b/assert/assertion_compare_go1.17_test.go
@@ -1,5 +1,9 @@
 // +build go1.17
 
+// TODO: once support for Go 1.16 is dropped, this file can be
+//       merged/removed with assertion_compare_can_convert.go and
+//       assertion_compare_legacy.go
+
 package assert
 
 import (
diff --git a/assert/assertion_compare_legacy.go b/assert/assertion_compare_legacy.go
index 478e953..0bb8ad7 100644
--- a/assert/assertion_compare_legacy.go
+++ b/assert/assertion_compare_legacy.go
@@ -1,5 +1,9 @@
 // +build !go1.17
 
+// TODO: once support for Go 1.16 is dropped, this file can be
+//       merged/removed with assertion_compare_go1.17_test.go and
+//       assertion_compare_can_convert.go
+
 package assert
 
 import "reflect"