diff --git a/test/repo1/test-a/APKBUILD b/test/repo1/test-a/APKBUILD
index fbdc2f6..d2c9928 100644
--- a/test/repo1/test-a/APKBUILD
+++ b/test/repo1/test-a/APKBUILD
@@ -12,28 +12,27 @@ makedepends=
 install=
 subpackages=
 source=""
+builddir="$srcdir/$pkgname-$pkgver"
 
 # append extra dependencies to -dev subpackage
 # remove if not used.
 # depends_dev="somepackage-dev"
 
-_builddir="$srcdir"/$pkgname-$pkgver
-
 prepare() {
-	mkdir -p "$_builddir"
+	mkdir -p "$builddir"
 }
 
 build() {
-	cd "$_builddir"
-	cat > $pkgname << __EOF__
-#!/bin/sh
-echo "hello from $pkgname-$pkgver"
-__EOF__
+	cd "$builddir"
+	cat > $pkgname <<-EOF
+		#!/bin/sh
+		echo "hello from $pkgname-$pkgver"
+	EOF
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	install -Dm755 $pkgname "$pkgdir"/usr/bin/$pkgname
 }
 
-md5sums="" #generate with 'abuild checksum'
+sha512sums="" #generate with 'abuild checksum'
diff --git a/test/repo1/test-b/APKBUILD b/test/repo1/test-b/APKBUILD
index 6c58e61..eda637e 100644
--- a/test/repo1/test-b/APKBUILD
+++ b/test/repo1/test-b/APKBUILD
@@ -12,28 +12,27 @@ makedepends=
 install=
 subpackages=
 source=""
+builddir="$srcdir/$pkgname-$pkgver"
 
 # append extra dependencies to -dev subpackage
 # remove if not used.
 # depends_dev="somepackage-dev"
 
-_builddir="$srcdir"/$pkgname-$pkgver
-
 prepare() {
-	mkdir -p "$_builddir"
+	mkdir -p "$builddir"
 }
 
 build() {
-	cd "$_builddir"
-	cat > $pkgname << __EOF__
-#!/bin/sh
-echo "hello from $pkgname-$pkgver"
-__EOF__
+	cd "$builddir"
+	cat > $pkgname <<-EOF
+		#!/bin/sh
+		echo "hello from $pkgname-$pkgver"
+	EOF
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	install -Dm755 $pkgname "$pkgdir"/usr/bin/$pkgname
 }
 
-md5sums="" #generate with 'abuild checksum'
+sha512sums="" #generate with 'abuild checksum'
diff --git a/test/repo1/test-c/APKBUILD b/test/repo1/test-c/APKBUILD
index 278a2a6..de4dea0 100644
--- a/test/repo1/test-c/APKBUILD
+++ b/test/repo1/test-c/APKBUILD
@@ -12,28 +12,27 @@ makedepends=
 install="test-c.pre-install"
 subpackages=
 source=""
+builddir="$srcdir/$pkgname-$pkgver"
 
 # append extra dependencies to -dev subpackage
 # remove if not used.
 # depends_dev="somepackage-dev"
 
-_builddir="$srcdir"/$pkgname-$pkgver
-
 prepare() {
-	mkdir -p "$_builddir"
+	mkdir -p "$builddir"
 }
 
 build() {
-	cd "$_builddir"
-	cat > $pkgname << __EOF__
-#!/bin/sh
-echo "hello from $pkgname-$pkgver"
-__EOF__
+	cd "$builddir"
+	cat > $pkgname <<-EOF
+		#!/bin/sh
+		echo "hello from $pkgname-$pkgver"
+	EOF
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	install -Dm755 $pkgname "$pkgdir"/usr/bin/$pkgname
 }
 
-md5sums="" #generate with 'abuild checksum'
+sha512sums="" #generate with 'abuild checksum'
diff --git a/test/repo1/test-d/APKBUILD b/test/repo1/test-d/APKBUILD
index b3d6c24..70b26c9 100644
--- a/test/repo1/test-d/APKBUILD
+++ b/test/repo1/test-d/APKBUILD
@@ -12,28 +12,27 @@ makedepends=
 install="$pkgname.post-install"
 subpackages=
 source=""
+builddir="$srcdir/$pkgname-$pkgver"
 
 # append extra dependencies to -dev subpackage
 # remove if not used.
 # depends_dev="somepackage-dev"
 
-_builddir="$srcdir"/$pkgname-$pkgver
-
 prepare() {
-	mkdir -p "$_builddir"
+	mkdir -p "$builddir"
 }
 
 build() {
-	cd "$_builddir"
-	cat > $pkgname << __EOF__
-#!/bin/sh
-echo "hello from $pkgname-$pkgver"
-__EOF__
+	cd "$builddir"
+	cat > $pkgname <<-EOF
+		#!/bin/sh
+		echo "hello from $pkgname-$pkgver"
+	EOF
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	install -Dm755 $pkgname "$pkgdir"/usr/bin/$pkgname
 }
 
-md5sums="" #generate with 'abuild checksum'
+sha512sums="" #generate with 'abuild checksum'
diff --git a/test/repo2/test-a/APKBUILD b/test/repo2/test-a/APKBUILD
index a014906..cafc43f 100644
--- a/test/repo2/test-a/APKBUILD
+++ b/test/repo2/test-a/APKBUILD
@@ -12,23 +12,23 @@ makedepends=
 install=
 subpackages=
 source=""
+builddir="$srcdir/$pkgname-$pkgver"
 
-_builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
-	mkdir -p "$_builddir"
+	mkdir -p "$builddir"
 }
 
 build() {
-	cd "$_builddir"
-	cat > $pkgname << __EOF__
-#!/bin/sh
-echo "hello from $pkgname-$pkgver"
-__EOF__
+	cd "$builddir"
+	cat > $pkgname <<-EOF
+		#!/bin/sh
+		echo "hello from $pkgname-$pkgver"
+	EOF
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	install -Dm755 $pkgname "$pkgdir"/usr/bin/$pkgname
 }
 
-md5sums="" #generate with 'abuild checksum'
+sha512sums="" #generate with 'abuild checksum'
diff --git a/test/repo2/test-b/APKBUILD b/test/repo2/test-b/APKBUILD
index 6c58e61..eda637e 100644
--- a/test/repo2/test-b/APKBUILD
+++ b/test/repo2/test-b/APKBUILD
@@ -12,28 +12,27 @@ makedepends=
 install=
 subpackages=
 source=""
+builddir="$srcdir/$pkgname-$pkgver"
 
 # append extra dependencies to -dev subpackage
 # remove if not used.
 # depends_dev="somepackage-dev"
 
-_builddir="$srcdir"/$pkgname-$pkgver
-
 prepare() {
-	mkdir -p "$_builddir"
+	mkdir -p "$builddir"
 }
 
 build() {
-	cd "$_builddir"
-	cat > $pkgname << __EOF__
-#!/bin/sh
-echo "hello from $pkgname-$pkgver"
-__EOF__
+	cd "$builddir"
+	cat > $pkgname <<-EOF
+		#!/bin/sh
+		echo "hello from $pkgname-$pkgver"
+	EOF
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	install -Dm755 $pkgname "$pkgdir"/usr/bin/$pkgname
 }
 
-md5sums="" #generate with 'abuild checksum'
+sha512sums="" #generate with 'abuild checksum'