diff --git a/tests/portbump/Makefile b/tests/portbump/Makefile
index f040868fbfc..0bc7a830ed1 100644
--- a/tests/portbump/Makefile
+++ b/tests/portbump/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.8 2021/08/29 08:18:17 jca Exp $
-
 # To add a test named ${testname}:
 #  1) Create test port directory with ${testname} name.
 #  2) Create the ${testname}.sample containing the desired result
diff --git a/tests/portbump/t10.sample b/tests/portbump/t10.sample
index ab429300dfe..a0976189981 100644
--- a/tests/portbump/t10.sample
+++ b/tests/portbump/t10.sample
@@ -1,5 +1,3 @@
-# $OpenBSD: t10.sample,v 1.2 2021/08/29 07:55:17 jca Exp $
-
 COMMENT-main =	another eDonkey P2P file sharing client
 COMMENT-web =	webserver interface to amuled
 COMMENT-daemon =stand-alone daemon/cmdline for amule
diff --git a/tests/portbump/t10/Makefile b/tests/portbump/t10/Makefile
index 04e50db4325..c706a597438 100644
--- a/tests/portbump/t10/Makefile
+++ b/tests/portbump/t10/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.3 2021/08/29 07:55:17 jca Exp $
-
 COMMENT-main =	another eDonkey P2P file sharing client
 COMMENT-web =	webserver interface to amuled
 COMMENT-daemon =stand-alone daemon/cmdline for amule
diff --git a/tests/portbump/t2/Makefile.inc b/tests/portbump/t2/Makefile.inc
index c836625d960..91a3621c032 100644
--- a/tests/portbump/t2/Makefile.inc
+++ b/tests/portbump/t2/Makefile.inc
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile.inc,v 1.10 2021/08/29 07:55:17 jca Exp $
-
 COMMENT-main=		server-side HTML-embedded scripting language
 COMMENT-fastcgi=	stand-alone FastCGI version of PHP
 
diff --git a/tests/portbump/t3/Makefile.inc b/tests/portbump/t3/Makefile.inc
index 5d1353f5b53..c9d920cde2e 100644
--- a/tests/portbump/t3/Makefile.inc
+++ b/tests/portbump/t3/Makefile.inc
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile.inc,v 1.1 2014/07/25 11:41:45 zhuk Exp $
-
 DIST_SUBDIR=		gnome
 
 MAINTAINER ?=		Jasper Lievisse Adriaanse <jasper@openbsd.org>, \
diff --git a/tests/portbump/t6/pkg/PLIST b/tests/portbump/t6/pkg/PLIST
index 420e6efd97b..44e7595c20e 100644
--- a/tests/portbump/t6/pkg/PLIST
+++ b/tests/portbump/t6/pkg/PLIST
@@ -1,2 +1 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2015/05/01 11:02:26 zhuk Exp $
 @bin bin/t6
diff --git a/tests/portbump/t7/pkg/PLIST-main b/tests/portbump/t7/pkg/PLIST-main
index cbb5c7a67d7..413746fb1ad 100644
--- a/tests/portbump/t7/pkg/PLIST-main
+++ b/tests/portbump/t7/pkg/PLIST-main
@@ -1,2 +1 @@
-@comment $OpenBSD: PLIST-main,v 1.1.1.1 2015/05/01 11:03:11 zhuk Exp $
 @bin bin/t7
diff --git a/tests/portbump/t7/pkg/PLIST-qt4 b/tests/portbump/t7/pkg/PLIST-qt4
index b16cc62f7b6..8be01b5087f 100644
--- a/tests/portbump/t7/pkg/PLIST-qt4
+++ b/tests/portbump/t7/pkg/PLIST-qt4
@@ -1,2 +1 @@
-@comment $OpenBSD: PLIST-qt4,v 1.1.1.1 2015/05/01 11:03:11 zhuk Exp $
 @bin bin/t7-qt4
diff --git a/tests/portbump/t8/Makefile.inc b/tests/portbump/t8/Makefile.inc
index ef8d9d77efb..fe5db0bfa39 100644
--- a/tests/portbump/t8/Makefile.inc
+++ b/tests/portbump/t8/Makefile.inc
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile.inc,v 1.2 2021/08/29 07:55:17 jca Exp $
-
 # common stuff for all gcc ports
 # we assume each one defines a V variable.
 
diff --git a/tests/portcheck/Makefile b/tests/portcheck/Makefile
index cbdca1283b4..0928106d566 100644
--- a/tests/portcheck/Makefile
+++ b/tests/portcheck/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.20 2017/12/22 23:12:22 zhuk Exp $
-
 # To add a test named ${testname}:
 #  1) If test should catch errors, add sample portcheck output to the
 #     ${testname}.sample file in this directory. Otherwise, this file should
diff --git a/tests/portcheck/Makefile.inc b/tests/portcheck/Makefile.inc
index adb6bc2e907..d39402d5f6a 100644
--- a/tests/portcheck/Makefile.inc
+++ b/tests/portcheck/Makefile.inc
@@ -1,3 +1,2 @@
-# $OpenBSD: Makefile.inc,v 1.2 2022/03/04 10:06:27 sthen Exp $
 CATEGORIES +=		${PKGPATH:C,/[^/]+$,,}
 PERMIT_PACKAGE ?=	Yes
diff --git a/tests/portcheck/t1/Makefile b/tests/portcheck/t1/Makefile
index ee637b2df4e..2f9148feb8d 100644
--- a/tests/portcheck/t1/Makefile
+++ b/tests/portcheck/t1/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2014/02/03 22:28:41 zhuk Exp $
-
 COMMENT =	test 1
 DISTNAME =	test-1
 
diff --git a/tests/portcheck/t1/pkg/PLIST b/tests/portcheck/t1/pkg/PLIST
index 2b6de331f66..02ec63d0365 100644
--- a/tests/portcheck/t1/pkg/PLIST
+++ b/tests/portcheck/t1/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2018/06/28 14:52:28 espie Exp $
 @conflict kdeutils-<4
 @bin bin/kcalc
 lib/libkdeinit4_kcalc.so
diff --git a/tests/portcheck/t10/Makefile b/tests/portcheck/t10/Makefile
index 8683a05618a..e58c0fab400 100644
--- a/tests/portcheck/t10/Makefile
+++ b/tests/portcheck/t10/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.1 2014/05/06 11:02:04 zhuk Exp $
-#
 # Check for ${PREFIX}/share/man/ and ${PREFIX}/share/info/
 
 COMMENT =	test 10
diff --git a/tests/portcheck/t10/pkg/PLIST b/tests/portcheck/t10/pkg/PLIST
index 4c2f23e485d..6a7f1418cdd 100644
--- a/tests/portcheck/t10/pkg/PLIST
+++ b/tests/portcheck/t10/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2016/03/23 16:30:38 zhuk Exp $
 @man man/man1/bar.1.gz
 share/man/
 share/man/man1/
diff --git a/tests/portcheck/t11/Makefile b/tests/portcheck/t11/Makefile
index 965776e7740..2b240f5da20 100644
--- a/tests/portcheck/t11/Makefile
+++ b/tests/portcheck/t11/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.2 2014/05/08 15:44:42 zhuk Exp $
-#
 # Check for @exec/@unexec-delete of glib-compile-schemas
 # when dependency is wrong.
 
diff --git a/tests/portcheck/t11/pkg/PLIST-exec b/tests/portcheck/t11/pkg/PLIST-exec
index 21acf03cafb..b53394a03dc 100644
--- a/tests/portcheck/t11/pkg/PLIST-exec
+++ b/tests/portcheck/t11/pkg/PLIST-exec
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-exec,v 1.1 2014/05/07 22:28:05 zhuk Exp $
 @exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
 share/glib-2.0/schemas/foo.xml
 @exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
diff --git a/tests/portcheck/t11/pkg/PLIST-main b/tests/portcheck/t11/pkg/PLIST-main
index 8ae1e88203b..f00c6632458 100644
--- a/tests/portcheck/t11/pkg/PLIST-main
+++ b/tests/portcheck/t11/pkg/PLIST-main
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-main,v 1.1 2014/05/07 22:28:05 zhuk Exp $
 share/glib-2.0/schemas/foo.xml
 @exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
 @unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
diff --git a/tests/portcheck/t11/pkg/PLIST-noexec b/tests/portcheck/t11/pkg/PLIST-noexec
index fe18b985ea6..a10eecab67e 100644
--- a/tests/portcheck/t11/pkg/PLIST-noexec
+++ b/tests/portcheck/t11/pkg/PLIST-noexec
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PLIST-noexec,v 1.1 2014/05/07 22:28:05 zhuk Exp $
 share/glib-2.0/schemas/foo.xml
 @unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
diff --git a/tests/portcheck/t11/pkg/PLIST-nounexec b/tests/portcheck/t11/pkg/PLIST-nounexec
index 623091e54ac..c3837b87441 100644
--- a/tests/portcheck/t11/pkg/PLIST-nounexec
+++ b/tests/portcheck/t11/pkg/PLIST-nounexec
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PLIST-nounexec,v 1.1 2014/05/07 22:28:05 zhuk Exp $
 share/glib-2.0/schemas/foo.xml
 @exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
diff --git a/tests/portcheck/t11/pkg/PLIST-unexec b/tests/portcheck/t11/pkg/PLIST-unexec
index 5d08a5fc911..773c4844cf2 100644
--- a/tests/portcheck/t11/pkg/PLIST-unexec
+++ b/tests/portcheck/t11/pkg/PLIST-unexec
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-unexec,v 1.1 2014/05/07 22:28:05 zhuk Exp $
 share/glib-2.0/schemas/foo.xml
 @exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
 @unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
diff --git a/tests/portcheck/t11/pkg/PLIST-wrong b/tests/portcheck/t11/pkg/PLIST-wrong
index e390b11f3a3..459d185a213 100644
--- a/tests/portcheck/t11/pkg/PLIST-wrong
+++ b/tests/portcheck/t11/pkg/PLIST-wrong
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-wrong,v 1.1 2014/05/07 22:28:05 zhuk Exp $
 share/glib-2.0/schemas/foo.xml
 @exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas
 @unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas
diff --git a/tests/portcheck/t12/Makefile b/tests/portcheck/t12/Makefile
index 8624499cfc6..09373e7a3ab 100644
--- a/tests/portcheck/t12/Makefile
+++ b/tests/portcheck/t12/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.2 2014/05/08 17:10:10 zhuk Exp $
-#
 # Check for @exec/@unexec-delete of glib-compile-schemas
 # when dependency is correct.
 
diff --git a/tests/portcheck/t12/pkg/PLIST-exec b/tests/portcheck/t12/pkg/PLIST-exec
index aa6b65bd835..b53394a03dc 100644
--- a/tests/portcheck/t12/pkg/PLIST-exec
+++ b/tests/portcheck/t12/pkg/PLIST-exec
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-exec,v 1.1 2014/05/08 15:44:43 zhuk Exp $
 @exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
 share/glib-2.0/schemas/foo.xml
 @exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
diff --git a/tests/portcheck/t12/pkg/PLIST-main b/tests/portcheck/t12/pkg/PLIST-main
index 570035bcbd4..f00c6632458 100644
--- a/tests/portcheck/t12/pkg/PLIST-main
+++ b/tests/portcheck/t12/pkg/PLIST-main
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-main,v 1.1 2014/05/08 15:44:43 zhuk Exp $
 share/glib-2.0/schemas/foo.xml
 @exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
 @unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
diff --git a/tests/portcheck/t12/pkg/PLIST-nodep b/tests/portcheck/t12/pkg/PLIST-nodep
index f27abddb40b..f00c6632458 100644
--- a/tests/portcheck/t12/pkg/PLIST-nodep
+++ b/tests/portcheck/t12/pkg/PLIST-nodep
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-nodep,v 1.1 2014/05/08 17:10:10 zhuk Exp $
 share/glib-2.0/schemas/foo.xml
 @exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
 @unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
diff --git a/tests/portcheck/t12/pkg/PLIST-noexec b/tests/portcheck/t12/pkg/PLIST-noexec
index 2b8bd265405..a10eecab67e 100644
--- a/tests/portcheck/t12/pkg/PLIST-noexec
+++ b/tests/portcheck/t12/pkg/PLIST-noexec
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PLIST-noexec,v 1.1 2014/05/08 15:44:43 zhuk Exp $
 share/glib-2.0/schemas/foo.xml
 @unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
diff --git a/tests/portcheck/t12/pkg/PLIST-nounexec b/tests/portcheck/t12/pkg/PLIST-nounexec
index 4b204539952..c3837b87441 100644
--- a/tests/portcheck/t12/pkg/PLIST-nounexec
+++ b/tests/portcheck/t12/pkg/PLIST-nounexec
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PLIST-nounexec,v 1.1 2014/05/08 15:44:43 zhuk Exp $
 share/glib-2.0/schemas/foo.xml
 @exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
diff --git a/tests/portcheck/t12/pkg/PLIST-unexec b/tests/portcheck/t12/pkg/PLIST-unexec
index b52eebeb7de..773c4844cf2 100644
--- a/tests/portcheck/t12/pkg/PLIST-unexec
+++ b/tests/portcheck/t12/pkg/PLIST-unexec
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-unexec,v 1.1 2014/05/08 15:44:43 zhuk Exp $
 share/glib-2.0/schemas/foo.xml
 @exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
 @unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
diff --git a/tests/portcheck/t12/pkg/PLIST-wrong b/tests/portcheck/t12/pkg/PLIST-wrong
index 913add65aa0..459d185a213 100644
--- a/tests/portcheck/t12/pkg/PLIST-wrong
+++ b/tests/portcheck/t12/pkg/PLIST-wrong
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-wrong,v 1.1 2014/05/08 15:44:43 zhuk Exp $
 share/glib-2.0/schemas/foo.xml
 @exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas
 @unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas
diff --git a/tests/portcheck/t13/Makefile b/tests/portcheck/t13/Makefile
index 8cd5132306e..0fc855c133d 100644
--- a/tests/portcheck/t13/Makefile
+++ b/tests/portcheck/t13/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2014/05/19 00:58:53 zhuk Exp $
-#
 # Check for leading articles in COMMENTs
 
 DISTNAME =		test-13
diff --git a/tests/portcheck/t13/pkg/PLIST-a b/tests/portcheck/t13/pkg/PLIST-a
index 595fe628c13..e69de29bb2d 100644
--- a/tests/portcheck/t13/pkg/PLIST-a
+++ b/tests/portcheck/t13/pkg/PLIST-a
@@ -1 +0,0 @@
-@comment $OpenBSD: PLIST-a,v 1.1.1.1 2014/05/19 00:58:53 zhuk Exp $
diff --git a/tests/portcheck/t13/pkg/PLIST-an b/tests/portcheck/t13/pkg/PLIST-an
index b2af63f6598..e69de29bb2d 100644
--- a/tests/portcheck/t13/pkg/PLIST-an
+++ b/tests/portcheck/t13/pkg/PLIST-an
@@ -1 +0,0 @@
-@comment $OpenBSD: PLIST-an,v 1.1.1.1 2014/05/19 00:58:53 zhuk Exp $
diff --git a/tests/portcheck/t13/pkg/PLIST-athe b/tests/portcheck/t13/pkg/PLIST-athe
index 2f694406790..e69de29bb2d 100644
--- a/tests/portcheck/t13/pkg/PLIST-athe
+++ b/tests/portcheck/t13/pkg/PLIST-athe
@@ -1 +0,0 @@
-@comment $OpenBSD: PLIST-athe,v 1.1.1.1 2014/05/19 00:58:53 zhuk Exp $
diff --git a/tests/portcheck/t13/pkg/PLIST-main b/tests/portcheck/t13/pkg/PLIST-main
index 19fe38e4657..e69de29bb2d 100644
--- a/tests/portcheck/t13/pkg/PLIST-main
+++ b/tests/portcheck/t13/pkg/PLIST-main
@@ -1 +0,0 @@
-@comment $OpenBSD: PLIST-main,v 1.1.1.1 2014/05/19 00:58:53 zhuk Exp $
diff --git a/tests/portcheck/t13/pkg/PLIST-the b/tests/portcheck/t13/pkg/PLIST-the
index 3e00d6bc505..e69de29bb2d 100644
--- a/tests/portcheck/t13/pkg/PLIST-the
+++ b/tests/portcheck/t13/pkg/PLIST-the
@@ -1 +0,0 @@
-@comment $OpenBSD: PLIST-the,v 1.1.1.1 2014/05/19 00:58:53 zhuk Exp $
diff --git a/tests/portcheck/t14/Makefile b/tests/portcheck/t14/Makefile
index 51ac42f0f15..aee577155ef 100644
--- a/tests/portcheck/t14/Makefile
+++ b/tests/portcheck/t14/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.1 2014/07/10 10:04:34 zhuk Exp $
-#
 # Check for both stdc++ in WANTLIB and gcc4 in MODULES
 
 DISTNAME =		test-14
diff --git a/tests/portcheck/t14/pkg/PLIST-foo b/tests/portcheck/t14/pkg/PLIST-foo
index d2ac296a8d6..e69de29bb2d 100644
--- a/tests/portcheck/t14/pkg/PLIST-foo
+++ b/tests/portcheck/t14/pkg/PLIST-foo
@@ -1 +0,0 @@
-@comment $OpenBSD: PLIST-foo,v 1.1 2014/07/10 10:04:34 zhuk Exp $
diff --git a/tests/portcheck/t14/pkg/PLIST-main b/tests/portcheck/t14/pkg/PLIST-main
index 75292abf7d2..e69de29bb2d 100644
--- a/tests/portcheck/t14/pkg/PLIST-main
+++ b/tests/portcheck/t14/pkg/PLIST-main
@@ -1 +0,0 @@
-@comment $OpenBSD: PLIST-main,v 1.1 2014/07/10 10:04:34 zhuk Exp $
diff --git a/tests/portcheck/t15/Makefile b/tests/portcheck/t15/Makefile
index 760640f652a..7e43613c2ad 100644
--- a/tests/portcheck/t15/Makefile
+++ b/tests/portcheck/t15/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.1 2015/04/12 20:42:44 zhuk Exp $
-
 COMMENT =	test 15, GH_COMMIT length
 DISTNAME =	test-15
 
diff --git a/tests/portcheck/t15/pkg/PLIST b/tests/portcheck/t15/pkg/PLIST
index bd5d57d2021..ea0359eed63 100644
--- a/tests/portcheck/t15/pkg/PLIST
+++ b/tests/portcheck/t15/pkg/PLIST
@@ -1,2 +1 @@
-@comment $OpenBSD: PLIST,v 1.1 2015/04/12 20:42:44 zhuk Exp $
 @bin bin/foobar.test
diff --git a/tests/portcheck/t16/Makefile b/tests/portcheck/t16/Makefile
index ccb106a80d7..83e804b41a8 100644
--- a/tests/portcheck/t16/Makefile
+++ b/tests/portcheck/t16/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2015/04/15 08:19:09 zhuk Exp $
-
 COMMENT =	test 16, non-standard top-level categories
 DISTNAME =	test-16
 CATEGORIES =	network the-x11 foo
diff --git a/tests/portcheck/t16/pkg/PLIST b/tests/portcheck/t16/pkg/PLIST
index 5966d484ecb..ea0359eed63 100644
--- a/tests/portcheck/t16/pkg/PLIST
+++ b/tests/portcheck/t16/pkg/PLIST
@@ -1,2 +1 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2015/04/15 08:19:09 zhuk Exp $
 @bin bin/foobar.test
diff --git a/tests/portcheck/t17/Makefile b/tests/portcheck/t17/Makefile
index 43a52fad8c5..537307d99ca 100644
--- a/tests/portcheck/t17/Makefile
+++ b/tests/portcheck/t17/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.2 2016/04/28 17:04:42 sthen Exp $
-#
 # Check for user settings in makefile
 
 COMMENT =	test 17
diff --git a/tests/portcheck/t17/pkg/PLIST b/tests/portcheck/t17/pkg/PLIST
index 05eb76f5431..a301301f30a 100644
--- a/tests/portcheck/t17/pkg/PLIST
+++ b/tests/portcheck/t17/pkg/PLIST
@@ -1,2 +1 @@
-@comment $OpenBSD: PLIST,v 1.1 2015/07/05 12:32:44 zhuk Exp $
 bin/foo17
diff --git a/tests/portcheck/t18/Makefile b/tests/portcheck/t18/Makefile
index f31ebd9eadb..a88d6cdd79d 100644
--- a/tests/portcheck/t18/Makefile
+++ b/tests/portcheck/t18/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2016/03/28 15:36:17 zhuk Exp $
-#
 # Check silence in case of PKG_ARCH=* and WANTLIB-= (empty)
 
 COMMENT		= test 18
diff --git a/tests/portcheck/t18/pkg/PLIST b/tests/portcheck/t18/pkg/PLIST
index 987f2aafd8e..463c1be875e 100644
--- a/tests/portcheck/t18/pkg/PLIST
+++ b/tests/portcheck/t18/pkg/PLIST
@@ -1,2 +1 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2016/03/28 15:36:17 zhuk Exp $
 bin/test18
diff --git a/tests/portcheck/t19/Makefile b/tests/portcheck/t19/Makefile
index ec57aac04fe..8480f3c7dce 100644
--- a/tests/portcheck/t19/Makefile
+++ b/tests/portcheck/t19/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2017/07/14 07:43:43 zhuk Exp $
-
 COMMENT =	test for Qt5 QML outside lib/qt5/qml
 DISTNAME =	t19-1.0
 
diff --git a/tests/portcheck/t19/pkg/PLIST b/tests/portcheck/t19/pkg/PLIST
index e8a87e12a5c..e4c7fa4659b 100644
--- a/tests/portcheck/t19/pkg/PLIST
+++ b/tests/portcheck/t19/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2017/07/14 07:43:43 zhuk Exp $
 include/KF5/
 include/KF5/KHolidays/
 include/KF5/KHolidays/KHolidays/
diff --git a/tests/portcheck/t2/Makefile b/tests/portcheck/t2/Makefile
index 3ac2230a8bb..5dffdf3b894 100644
--- a/tests/portcheck/t2/Makefile
+++ b/tests/portcheck/t2/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile,v 1.2 2014/07/23 22:34:06 zhuk Exp $
 # "fixed" version of t1
 
 COMMENT =	test 2
diff --git a/tests/portcheck/t2/pkg/PLIST b/tests/portcheck/t2/pkg/PLIST
index 2b6de331f66..02ec63d0365 100644
--- a/tests/portcheck/t2/pkg/PLIST
+++ b/tests/portcheck/t2/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2018/06/28 14:52:28 espie Exp $
 @conflict kdeutils-<4
 @bin bin/kcalc
 lib/libkdeinit4_kcalc.so
diff --git a/tests/portcheck/t20/Makefile b/tests/portcheck/t20/Makefile
index 169a311f3f8..ff07484bce4 100644
--- a/tests/portcheck/t20/Makefile
+++ b/tests/portcheck/t20/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2017/07/14 07:44:33 zhuk Exp $
-
 COMMENT =	test for missing x11/qt5/qtdeclarative dependency
 DISTNAME =	t20-1.0
 
diff --git a/tests/portcheck/t20/pkg/PLIST b/tests/portcheck/t20/pkg/PLIST
index 8578440a299..eb50d0207b0 100644
--- a/tests/portcheck/t20/pkg/PLIST
+++ b/tests/portcheck/t20/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2017/07/14 07:44:33 zhuk Exp $
 include/KF5/
 include/KF5/KHolidays/
 include/KF5/KHolidays/KHolidays/
diff --git a/tests/portcheck/t21/Makefile b/tests/portcheck/t21/Makefile
index 6f27899eb16..d70705d801b 100644
--- a/tests/portcheck/t21/Makefile
+++ b/tests/portcheck/t21/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2017/07/14 07:44:55 zhuk Exp $
-
 COMMENT =	test for QML files with missing Qt dependency
 DISTNAME =	t21-1.0
 
diff --git a/tests/portcheck/t21/pkg/PLIST b/tests/portcheck/t21/pkg/PLIST
index 395a44725e8..3dee3799923 100644
--- a/tests/portcheck/t21/pkg/PLIST
+++ b/tests/portcheck/t21/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2017/07/14 07:44:55 zhuk Exp $
 include/KF5/
 include/KF5/KHolidays/
 include/KF5/KHolidays/KHolidays/
diff --git a/tests/portcheck/t22/Makefile b/tests/portcheck/t22/Makefile
index 6cccc59e1c8..8b9ea4e0bf2 100644
--- a/tests/portcheck/t22/Makefile
+++ b/tests/portcheck/t22/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2017/12/22 23:11:21 zhuk Exp $
-#
 # Check for forgotten @rcscripts
 
 COMMENT =	test 22
diff --git a/tests/portcheck/t22/pkg/PLIST b/tests/portcheck/t22/pkg/PLIST
index d63d8407f82..20cfa64c8ae 100644
--- a/tests/portcheck/t22/pkg/PLIST
+++ b/tests/portcheck/t22/pkg/PLIST
@@ -1,2 +1 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2017/12/22 23:11:21 zhuk Exp $
 bin/foo22
diff --git a/tests/portcheck/t22/pkg/t22.rc b/tests/portcheck/t22/pkg/t22.rc
index b67070a4e1c..3918d5ea0b1 100644
--- a/tests/portcheck/t22/pkg/t22.rc
+++ b/tests/portcheck/t22/pkg/t22.rc
@@ -1,4 +1,3 @@
-# $OpenBSD: t22.rc,v 1.1.1.1 2017/12/22 23:11:21 zhuk Exp $
 
 daemon=t22
 
diff --git a/tests/portcheck/t23/Makefile b/tests/portcheck/t23/Makefile
index c70a1838004..57a86965c3f 100644
--- a/tests/portcheck/t23/Makefile
+++ b/tests/portcheck/t23/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2017/12/22 23:11:39 zhuk Exp $
-#
 # Check for forgotten README files
 
 COMMENT =	test 23
diff --git a/tests/portcheck/t23/pkg/PLIST b/tests/portcheck/t23/pkg/PLIST
index 10312362254..d2c4ad2f858 100644
--- a/tests/portcheck/t23/pkg/PLIST
+++ b/tests/portcheck/t23/pkg/PLIST
@@ -1,2 +1 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2017/12/22 23:11:39 zhuk Exp $
 bin/foo23
diff --git a/tests/portcheck/t23/pkg/README b/tests/portcheck/t23/pkg/README
index 179d7e9e4c2..21aec234e4e 100644
--- a/tests/portcheck/t23/pkg/README
+++ b/tests/portcheck/t23/pkg/README
@@ -1,3 +1 @@
-$OpenBSD: README,v 1.1.1.1 2017/12/22 23:11:39 zhuk Exp $
-
 A simple readme file.
diff --git a/tests/portcheck/t3/Makefile b/tests/portcheck/t3/Makefile
index 2ddd6f9928f..80b17449b86 100644
--- a/tests/portcheck/t3/Makefile
+++ b/tests/portcheck/t3/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.2 2014/07/23 22:34:06 zhuk Exp $
-#
 # Check there are no distinfo checks in -A mode
 
 COMMENT =	test 3
diff --git a/tests/portcheck/t3/pkg/PLIST b/tests/portcheck/t3/pkg/PLIST
index 2b6de331f66..02ec63d0365 100644
--- a/tests/portcheck/t3/pkg/PLIST
+++ b/tests/portcheck/t3/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2018/06/28 14:52:28 espie Exp $
 @conflict kdeutils-<4
 @bin bin/kcalc
 lib/libkdeinit4_kcalc.so
diff --git a/tests/portcheck/t4/Makefile b/tests/portcheck/t4/Makefile
index d784675ee11..ead2fd19d2c 100644
--- a/tests/portcheck/t4/Makefile
+++ b/tests/portcheck/t4/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.2 2014/07/23 22:34:06 zhuk Exp $
-#
 # Won't fail because distinfo checks don't happen for checking
 # "existing" ports, and -P is used to skip PLIST checks.
 
diff --git a/tests/portcheck/t4/pkg/PLIST b/tests/portcheck/t4/pkg/PLIST
index c236118636a..500c7e84975 100644
--- a/tests/portcheck/t4/pkg/PLIST
+++ b/tests/portcheck/t4/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2014/02/03 22:28:41 zhuk Exp $
 @conflict kdeutils-<4
 @bin bin/kcalc
 lib/libkdeinit4_kcalc.so
diff --git a/tests/portcheck/t5/Makefile b/tests/portcheck/t5/Makefile
index f9cc8bf8cb1..d982ab9c3e0 100644
--- a/tests/portcheck/t5/Makefile
+++ b/tests/portcheck/t5/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.3 2016/03/23 16:31:18 zhuk Exp $
-#
 # Check catching most obvious things
 
 COMMENT =	test 5
diff --git a/tests/portcheck/t5/pkg/PLIST b/tests/portcheck/t5/pkg/PLIST
index e7e7a305dad..838ec9cd3e2 100644
--- a/tests/portcheck/t5/pkg/PLIST
+++ b/tests/portcheck/t5/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.3 2015/04/15 08:20:49 zhuk Exp $
 share/applications/kde4/kcalc.desktop
 share/doc/HTML/en/kcalc/index.cache.bz2
 share/doc/HTML/en/kcalc/index.docbook
diff --git a/tests/portcheck/t6/Makefile b/tests/portcheck/t6/Makefile
index 42a6b2d8ef1..1b1f286b123 100644
--- a/tests/portcheck/t6/Makefile
+++ b/tests/portcheck/t6/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2014/02/09 15:11:45 zhuk Exp $
 # Test gtk-update-icon-cache
 
 COMMENT =	test 6
diff --git a/tests/portcheck/t6/pkg/PLIST b/tests/portcheck/t6/pkg/PLIST
index e55a3a624f0..1c5c067b146 100644
--- a/tests/portcheck/t6/pkg/PLIST
+++ b/tests/portcheck/t6/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2014/02/09 15:11:45 zhuk Exp $
 share/icons/bartheme/32x32/shmalice.png
 share/icons/footheme/32x32/alice.png
 @exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/footheme
diff --git a/tests/portcheck/t7/Makefile b/tests/portcheck/t7/Makefile
index 241f6d85adf..b4e3a588e6b 100644
--- a/tests/portcheck/t7/Makefile
+++ b/tests/portcheck/t7/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.3 2017/07/16 19:19:02 espie Exp $
-
 COMMENT=	tempo/pitch audio processing library
 
 DISTNAME=	soundtouch-1.3.1
diff --git a/tests/portcheck/t7/pkg/PLIST b/tests/portcheck/t7/pkg/PLIST
index 3c660df6cf2..2fd90bb07ca 100644
--- a/tests/portcheck/t7/pkg/PLIST
+++ b/tests/portcheck/t7/pkg/PLIST
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2014/02/09 16:11:16 zhuk Exp $
 share/doc/HTML/en/kcalc/
 share/doc/HTML/en/kcalc/index.docbook
diff --git a/tests/portcheck/t8/Makefile b/tests/portcheck/t8/Makefile
index 9036868d085..5dfe16e4dce 100644
--- a/tests/portcheck/t8/Makefile
+++ b/tests/portcheck/t8/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.2 2014/05/08 07:02:59 zhuk Exp $
-
 COMMENT =	test 8
 DISTNAME =	test-8
 
diff --git a/tests/portcheck/t8/pkg/PLIST b/tests/portcheck/t8/pkg/PLIST
index 39152b5be1d..52aa4818aca 100644
--- a/tests/portcheck/t8/pkg/PLIST
+++ b/tests/portcheck/t8/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2014/02/09 18:14:05 zhuk Exp $
 @conflict kdeutils-<4
 share/examples/t8/
 @sample /var/t8/
diff --git a/tests/portcheck/t8/pkg/README b/tests/portcheck/t8/pkg/README
index 3a0c5180ee8..f91973dd130 100644
--- a/tests/portcheck/t8/pkg/README
+++ b/tests/portcheck/t8/pkg/README
@@ -1,3 +1 @@
-$OpenBSD: README,v 1.1.1.1 2014/02/09 18:14:05 zhuk Exp $
-
 This line mentions /var/t8 and should produce warning.
diff --git a/tests/portcheck/t9/Makefile b/tests/portcheck/t9/Makefile
index 2b51fa7ad36..6b80a0262e2 100644
--- a/tests/portcheck/t9/Makefile
+++ b/tests/portcheck/t9/Makefile
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.1 2014/04/27 17:59:21 zhuk Exp $
-#
 # Check for extra PERMIT_* lines
 
 COMMENT-main =	test 9 main
diff --git a/tests/portcheck/t9/pkg/PLIST b/tests/portcheck/t9/pkg/PLIST
index 1048d51a3ae..e69de29bb2d 100644
--- a/tests/portcheck/t9/pkg/PLIST
+++ b/tests/portcheck/t9/pkg/PLIST
@@ -1 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.1 2014/04/27 17:59:21 zhuk Exp $