diff --git a/tests/abuild_test b/tests/abuild_test
index 775cb57d7273ae8d795e2ecbe88758567c6808a1..ee4d8ff488b6c5e6e38185832084eed6b296a474 100755
--- a/tests/abuild_test
+++ b/tests/abuild_test
@@ -567,8 +567,6 @@ abuild_package_size_body() {
 	cd test-size
 	cat > APKBUILD <<-EOF
 		maintainer="Test User 123 <123@example.com>"
-
-		# test package
 		pkgname="test-size"
 		pkgver="1.0"
 		pkgrel=0
@@ -677,8 +675,6 @@ abuild_keepdirs_body() {
 	cd test-amove
 	cat > APKBUILD <<-EOF
 		maintainer="Test User 123 <123@example.com>"
-
-		# test package
 		pkgname="test-keepdirs"
 		pkgver="1.0"
 		pkgrel=0
@@ -703,8 +699,6 @@ abuild_amove_body() {
 	cd test-amove
 	cat > APKBUILD <<-EOF
 		maintainer="Test User 123 <123@example.com>"
-
-		# test package
 		pkgname="test-amove"
 		pkgver="1.0"
 		pkgrel=0
@@ -799,7 +793,6 @@ abuild_doc_body() {
 	cd foo
 	cat > APKBUILD <<-EOF
 		maintainer="Test User 123 <123@example.com>"
-		# test package
 		pkgname="foo"
 		pkgver="1.0"
 		pkgrel=0
@@ -837,7 +830,6 @@ abuild_dev_body() {
 	cd foo
 	cat > APKBUILD <<-EOF
 		maintainer="Test User 123 <123@example.com>"
-		# test package
 		pkgname="foo"
 		pkgver="1.0"
 		pkgrel=0
@@ -946,7 +938,6 @@ abuild_cleanoldpkg_body() {
 		for v in 0.9 1.0 1.1; do
 			cat > APKBUILD <<-EOF
 				maintainer="Test User 123 <123@example.com>"
-				# test package
 				pkgname="foo"
 				pkgver="$v"
 				pkgrel=0
diff --git a/tests/testrepo/dbgpkg/APKBUILD b/tests/testrepo/dbgpkg/APKBUILD
index 9782fb7e0b6c25cc477e4abae7409ab9176bc0d5..da891e1230233a04f45b54ed4f3fb4ec320bdea9 100644
--- a/tests/testrepo/dbgpkg/APKBUILD
+++ b/tests/testrepo/dbgpkg/APKBUILD
@@ -1,6 +1,4 @@
 maintainer="Natanael Copa <ncopa@alpinelinux.org>"
-
-# test package
 pkgname="dbgpkg"
 pkgver="1.0"
 pkgrel=0
diff --git a/tests/testrepo/invalid-filename/APKBUILD b/tests/testrepo/invalid-filename/APKBUILD
index ecf368da7caeb86b2bd32d7892b6c1a97eb310a8..7ba71f6c336e2cd6bb0f32d07d167e9f5979a401 100644
--- a/tests/testrepo/invalid-filename/APKBUILD
+++ b/tests/testrepo/invalid-filename/APKBUILD
@@ -1,6 +1,4 @@
 maintainer="Natanael Copa <ncopa@alpinelinux.org>"
-
-# test package
 pkgname="invalid-filename"
 pkgver="1.0"
 pkgrel=0
diff --git a/tests/testrepo/large-doc-subpkg/APKBUILD b/tests/testrepo/large-doc-subpkg/APKBUILD
index 623c4b2f9db33433ea67216a318a7a105366a871..b73a653072bfaec8818f24e68ee7d42758e133ec 100644
--- a/tests/testrepo/large-doc-subpkg/APKBUILD
+++ b/tests/testrepo/large-doc-subpkg/APKBUILD
@@ -1,6 +1,4 @@
 maintainer="Natanael Copa <ncopa@alpinelinux.org>"
-
-# test package
 pkgname="large-doc-subpkg"
 pkgver="1.0"
 pkgrel=0
diff --git a/tests/testrepo/lib64test/APKBUILD b/tests/testrepo/lib64test/APKBUILD
index 0f3c1d7ad435d0cbb152f4b0848b43f81c256930..62fbff3eb665083917b595bff502c21153e44681 100644
--- a/tests/testrepo/lib64test/APKBUILD
+++ b/tests/testrepo/lib64test/APKBUILD
@@ -1,6 +1,4 @@
 maintainer="Natanael Copa <ncopa@alpinelinux.org>"
-
-# test package
 pkgname="lib64test"
 pkgver="1.0"
 pkgrel=0
diff --git a/tests/testrepo/pkg path with spaces/APKBUILD b/tests/testrepo/pkg path with spaces/APKBUILD
index 70afebc6d4dbcbc2e2120957c58a309b33b71bb9..456b6df8a82d3526b408e31f719957a582f5ee31 100644
--- a/tests/testrepo/pkg path with spaces/APKBUILD	
+++ b/tests/testrepo/pkg path with spaces/APKBUILD	
@@ -1,6 +1,4 @@
 maintainer="Natanael Copa <ncopa@alpinelinux.org>"
-
-# test package
 pkgname="pkg-path-with-spaces"
 pkgver="1.0"
 pkgrel=0
diff --git a/tests/testrepo/pkg1/APKBUILD b/tests/testrepo/pkg1/APKBUILD
index 60b9efdf713f9d681b45dac4e157ffba1de256f4..baf8894995bfb6f407bff2922b0f200e5d4fc9f3 100644
--- a/tests/testrepo/pkg1/APKBUILD
+++ b/tests/testrepo/pkg1/APKBUILD
@@ -1,6 +1,4 @@
 maintainer="Natanael Copa <ncopa@alpinelinux.org>"
-
-# test package
 pkgname="pkg1"
 pkgver="1.0"
 pkgrel=0
diff --git a/tests/testrepo/setcap/APKBUILD b/tests/testrepo/setcap/APKBUILD
index d6f9d4b8f3284b2b7db7133878e0709d6993ec99..b6ed08b7977e057007f37b8bcb65e063bbf07f97 100644
--- a/tests/testrepo/setcap/APKBUILD
+++ b/tests/testrepo/setcap/APKBUILD
@@ -1,6 +1,4 @@
 maintainer="Natanael Copa <ncopa@alpinelinux.org>"
-
-# test package
 pkgname=setcap
 pkgver="1.0"
 pkgrel=0
diff --git a/tests/testrepo/subpackage-arch/APKBUILD b/tests/testrepo/subpackage-arch/APKBUILD
index ace5945525687295bd7e850c3f15507024316e3a..6d0f909e4d05db06bcb89f6d57b89c49c56ab3e5 100644
--- a/tests/testrepo/subpackage-arch/APKBUILD
+++ b/tests/testrepo/subpackage-arch/APKBUILD
@@ -1,6 +1,4 @@
 maintainer="Natanael Copa <ncopa@alpinelinux.org>"
-
-# test package
 pkgname=${TESTNAME-test-pkgname}
 pkgver="${TESTPKGVER-1.0}"
 pkgrel=0
diff --git a/tests/testrepo/test-licenses/APKBUILD b/tests/testrepo/test-licenses/APKBUILD
index 947c46ef08713a97c63caccf6fe39b7cff77c172..926b300c1ccac978a6ebbba232a6748f54c0e3f5 100644
--- a/tests/testrepo/test-licenses/APKBUILD
+++ b/tests/testrepo/test-licenses/APKBUILD
@@ -1,6 +1,4 @@
 maintainer="Olliver Schinagl <oliver@schinagl.nl>"
-
-# test package
 pkgname="${TESTNAME-test-licenses}"
 pkgver="1.0"
 pkgrel=0
diff --git a/tests/testrepo/test-pkgname/APKBUILD b/tests/testrepo/test-pkgname/APKBUILD
index c1eee33e766cb44282a9d4077f8ea371113bb3dc..7de5adbc192fc5b23e3311745da826ec457bbb93 100644
--- a/tests/testrepo/test-pkgname/APKBUILD
+++ b/tests/testrepo/test-pkgname/APKBUILD
@@ -1,6 +1,4 @@
 maintainer="Natanael Copa <ncopa@alpinelinux.org>"
-
-# test package
 pkgname=${TESTNAME-test-pkgname}
 pkgver="${TESTPKGVER-1.0}"
 pkgrel=0