diff --git a/usr.bin/m4/TEST/math.m4 b/usr.bin/m4/TEST/math.m4
index 0262af66e25..e8cae3333b4 100644
--- a/usr.bin/m4/TEST/math.m4
+++ b/usr.bin/m4/TEST/math.m4
@@ -1,4 +1,3 @@
-dnl $FreeBSD$
 dnl A regression test for m4 C operators		(ksb,petef)
 dnl If you think you have a short-circuiting m4, run us m4 -DSHORCIRCUIT=yes
 dnl
diff --git a/usr.bin/m4/tests/args.m4 b/usr.bin/m4/tests/args.m4
index 3ad30f2442e..2be7c3fd51f 100644
--- a/usr.bin/m4/tests/args.m4
+++ b/usr.bin/m4/tests/args.m4
@@ -1,4 +1,3 @@
-dnl $FreeBSD$
 dnl $OpenBSD: src/regress/usr.bin/m4/args.m4,v 1.1 2001/10/10 23:23:59 espie Exp $
 dnl Expanding all arguments
 define(`A', `first form: $@, second form $*')dnl
diff --git a/usr.bin/m4/tests/args2.m4 b/usr.bin/m4/tests/args2.m4
index 3f9ed600fca..22f75a0e13a 100644
--- a/usr.bin/m4/tests/args2.m4
+++ b/usr.bin/m4/tests/args2.m4
@@ -1,4 +1,3 @@
-dnl $FreeBSD$
 dnl $OpenBSD: src/regress/usr.bin/m4/args2.m4,v 1.1 2008/08/16 09:57:12 espie Exp $
 dnl Preserving spaces within nested parentheses
 define(`foo',`$1')dnl
diff --git a/usr.bin/m4/tests/comments.m4 b/usr.bin/m4/tests/comments.m4
index d7038c4f636..e94165a1907 100644
--- a/usr.bin/m4/tests/comments.m4
+++ b/usr.bin/m4/tests/comments.m4
@@ -1,4 +1,3 @@
-dnl $FreeBSD$
 dnl $OpenBSD: src/regress/usr.bin/m4/comments.m4,v 1.1 2005/09/06 15:33:21 espie Exp $
 dnl checking the way changecom works.
 1: normal
diff --git a/usr.bin/m4/tests/esyscmd.m4 b/usr.bin/m4/tests/esyscmd.m4
index 7b1342d39d8..a9b83c478e4 100644
--- a/usr.bin/m4/tests/esyscmd.m4
+++ b/usr.bin/m4/tests/esyscmd.m4
@@ -1,4 +1,3 @@
-dnl $FreeBSD$
 changequote(`{',`}')dnl
 dnl
 esyscmd({sh -c "m4<<EOF
diff --git a/usr.bin/m4/tests/eval.m4 b/usr.bin/m4/tests/eval.m4
index 361f9b9c541..1d3f886d0d8 100644
--- a/usr.bin/m4/tests/eval.m4
+++ b/usr.bin/m4/tests/eval.m4
@@ -1,4 +1,3 @@
-dnl $FreeBSD$
 dnl $OpenBSD: src/regress/usr.bin/m4/eval.m4,v 1.1 2004/05/12 21:24:37 espie Exp $
 dnl expr parser
 eval(224&127)
diff --git a/usr.bin/m4/tests/gnueval.m4 b/usr.bin/m4/tests/gnueval.m4
index 9e7b57661ff..c0911ac8aef 100644
--- a/usr.bin/m4/tests/gnueval.m4
+++ b/usr.bin/m4/tests/gnueval.m4
@@ -1,4 +1,3 @@
-dnl $FreeBSD$
 dnl $OpenBSD: src/regress/usr.bin/m4/gnueval.m4,v 1.1 2012/04/12 16:58:15 espie Exp $
 dnl exponentiation is right associative
 eval(`4**2**3')
diff --git a/usr.bin/m4/tests/gnuformat.m4 b/usr.bin/m4/tests/gnuformat.m4
index 429d26512e1..b9cf8b7d92c 100644
--- a/usr.bin/m4/tests/gnuformat.m4
+++ b/usr.bin/m4/tests/gnuformat.m4
@@ -1,2 +1 @@
-dnl $FreeBSD$
 format(`a%15sa%%b%-15sbc%3scd%-3sd', `string', `pouet', `toolong', `toolong2')
diff --git a/usr.bin/m4/tests/gnupatterns.m4 b/usr.bin/m4/tests/gnupatterns.m4
index 735d1cf1bd2..8670d1c44f4 100644
--- a/usr.bin/m4/tests/gnupatterns.m4
+++ b/usr.bin/m4/tests/gnupatterns.m4
@@ -1,4 +1,3 @@
-dnl $FreeBSD$
 patsubst(`string with a + to replace with a minus', `+', `minus')
 patsubst(`string with aaaaa to replace with a b', `a+', `b')
 patsubst(`+string with a starting + to replace with a minus', `^+', `minus')
diff --git a/usr.bin/m4/tests/gnupatterns2.m4 b/usr.bin/m4/tests/gnupatterns2.m4
index 23170b7f354..43de995db81 100644
--- a/usr.bin/m4/tests/gnupatterns2.m4
+++ b/usr.bin/m4/tests/gnupatterns2.m4
@@ -1,4 +1,3 @@
-dnl $FreeBSD$
 define(`zoinx',dnl
 `patsubst($1,\(\w+\)\(\W*\),\1 )')dnl
 zoinx(acosl asinl atanl \
diff --git a/usr.bin/m4/tests/gnusofterror.m4 b/usr.bin/m4/tests/gnusofterror.m4
index 5ddc028176b..5cf88ab3a14 100644
--- a/usr.bin/m4/tests/gnusofterror.m4
+++ b/usr.bin/m4/tests/gnusofterror.m4
@@ -1,4 +1,3 @@
-dnl $FreeBSD$
 dnl $OpenBSD: src/regress/usr.bin/m4/gnusofterror.m4,v 1.1 2012/04/12 16:58:15 espie Exp $
 include(`hey I do not exit')dnl
 abc
diff --git a/usr.bin/m4/tests/includes.aux b/usr.bin/m4/tests/includes.aux
index a9779693a07..efb8a692d10 100644
--- a/usr.bin/m4/tests/includes.aux
+++ b/usr.bin/m4/tests/includes.aux
@@ -1,3 +1,2 @@
-dnl $FreeBSD$
 dnl $OpenBSD: src/regress/usr.bin/m4/includes.aux,v 1.1 2008/08/16 10:02:32 espie Exp $
 hello world dnl
diff --git a/usr.bin/m4/tests/includes.m4 b/usr.bin/m4/tests/includes.m4
index c06e763d85d..bd9c22dfbd0 100644
--- a/usr.bin/m4/tests/includes.m4
+++ b/usr.bin/m4/tests/includes.m4
@@ -1,4 +1,3 @@
-dnl $FreeBSD$
 dnl $OpenBSD: src/regress/usr.bin/m4/includes.m4,v 1.1 2008/08/16 10:02:32 espie Exp $
 dnl Check that include can occur within parameters
 define(`foo', include(includes.aux))dnl
diff --git a/usr.bin/m4/tests/m4wrap3.m4 b/usr.bin/m4/tests/m4wrap3.m4
index a0dffb0d4d5..bcfc788cb59 100644
--- a/usr.bin/m4/tests/m4wrap3.m4
+++ b/usr.bin/m4/tests/m4wrap3.m4
@@ -1,4 +1,3 @@
-dnl $FreeBSD$
 dnl $OpenBSD: src/regress/usr.bin/m4/m4wrap3.m4,v 1.1 2005/03/02 10:12:41 espie Exp $
 dnl Another test, this time for multiple wrappers
 dnl Check the behavior in presence of recursive m4wraps
diff --git a/usr.bin/m4/tests/patterns.m4 b/usr.bin/m4/tests/patterns.m4
index e0647787b76..48e63449815 100644
--- a/usr.bin/m4/tests/patterns.m4
+++ b/usr.bin/m4/tests/patterns.m4
@@ -1,4 +1,3 @@
-dnl $FreeBSD$
 dnl $OpenBSD: src/regress/usr.bin/m4/patterns.m4,v 1.4 2003/06/08 20:11:45 espie Exp $
 patsubst(`quote s in string', `(s)', `\\\1')
 patsubst(`check whether subst
diff --git a/usr.bin/m4/tests/quotes.m4 b/usr.bin/m4/tests/quotes.m4
index c783e22298a..376cc1e42c0 100644
--- a/usr.bin/m4/tests/quotes.m4
+++ b/usr.bin/m4/tests/quotes.m4
@@ -1,4 +1,3 @@
-dnl $FreeBSD$
 dnl $OpenBSD: src/regress/usr.bin/m4/quotes.m4,v 1.2 2005/09/06 15:33:21 espie Exp $
 dnl Checking the way changequote() is supposed to work
 define(`string',`STRING')dnl
diff --git a/usr.bin/m4/tests/redef.m4 b/usr.bin/m4/tests/redef.m4
index de01f674b45..4def2df15e2 100644
--- a/usr.bin/m4/tests/redef.m4
+++ b/usr.bin/m4/tests/redef.m4
@@ -1,4 +1,3 @@
-dnl $FreeBSD$
 dnl $OpenBSD: src/regress/usr.bin/m4/redef.m4,v 1.2 2001/09/27 22:40:58 espie Exp $
 dnl check all properties of builtin are passed on, including args behavior
 define(`mybuiltin',defn(`builtin'))dnl
diff --git a/usr.bin/m4/tests/translit.m4 b/usr.bin/m4/tests/translit.m4
index 19af2e1fcce..77b4fe0f193 100644
--- a/usr.bin/m4/tests/translit.m4
+++ b/usr.bin/m4/tests/translit.m4
@@ -1,4 +1,3 @@
-dnl $FreeBSD$
 dnl $OpenBSD: src/regress/usr.bin/m4/translit.m4,v 1.1 2010/03/23 20:11:52 espie Exp $
 dnl first one should match, not second one
 translit(`onk*', `**', `p_')
diff --git a/usr.bin/m4/tests/translit2.m4 b/usr.bin/m4/tests/translit2.m4
index ec26c084057..5c53a57cf3c 100644
--- a/usr.bin/m4/tests/translit2.m4
+++ b/usr.bin/m4/tests/translit2.m4
@@ -1,4 +1,3 @@
-dnl $FreeBSD$
 translit(`[HAVE_abc/def.h
 ]', `
 /.', `/  ')