diff --git a/newapkbuild.in b/newapkbuild.in
index 59c5f70..541f261 100644
--- a/newapkbuild.in
+++ b/newapkbuild.in
@@ -104,6 +104,18 @@ build_python() {
 __EOF__
 }
 
+check_make() {
+	cat >>APKBUILD<<__EOF__
+	make check
+__EOF__
+}
+
+check_python() {
+	cat >>APKBUILD<<__EOF__
+	python3 setup.py check
+__EOF__
+}
+
 # Package sections
 package_make() {
 	cat >>APKBUILD<<__EOF__
@@ -275,6 +287,24 @@ __EOF__
 	cat >>APKBUILD<<__EOF__
 }
 
+__EOF__
+
+	# Create check() function
+	cat >>APKBUILD<<__EOF__
+check() {
+	cd "\$builddir"
+__EOF__
+
+	case "$buildtype" in
+	make|cmake|autotools|perl)
+		check_make;;
+	python)
+		check_python;;
+	esac
+
+	cat >>APKBUILD<<__EOF__
+}
+
 __EOF__
 
 	# Create package() function