diff --git a/tageditor/default/PKGBUILD b/tageditor/default/PKGBUILD
index cf17cbfa..81db3070 100644
--- a/tageditor/default/PKGBUILD
+++ b/tageditor/default/PKGBUILD
@@ -23,6 +23,7 @@ depends=('qtutilities>=5.6.0' 'tagparser>=6.2.0' 'desktop-file-utils' 'xdg-utils
 [[ $_js_provider == script ]] && depends+=('qt5-script>=5.6')
 [[ $_js_provider == qml ]] && depends+=('qt5-declarative>=5.6')
 makedepends=('cmake' 'qt5-tools')
+checkdepends=('cppunit')
 url="https://github.com/Martchus/${_reponame}"
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
 sha256sums=('1b5e44ffc224cd26531f3dd99945ff5e60c051027421dd027bd3f133fbb0d2a8')
@@ -37,6 +38,15 @@ build() {
   make
 }
 
+check() {
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  if [[ $TEST_FILE_PATH ]]; then
+    make check
+  else
+    msg2 'Skipping execution of testsuite because the environment variable TESTFILE_PATH is not set.'
+  fi
+}
+
 package() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
   make DESTDIR="${pkgdir}" install
diff --git a/tageditor/git/PKGBUILD b/tageditor/git/PKGBUILD
index 44e196bb..d6905251 100644
--- a/tageditor/git/PKGBUILD
+++ b/tageditor/git/PKGBUILD
@@ -24,6 +24,7 @@ depends=('qtutilities-git' 'tagparser-git' 'desktop-file-utils' 'xdg-utils')
 [[ $_js_provider == script ]] && depends+=('qt5-script')
 [[ $_js_provider == qml ]] && depends+=('qt5-declarative')
 makedepends=('cmake' 'qt5-tools' 'git')
+checkdepends=('cppunit')
 provides=("${_name}")
 conflicts=("${_name}")
 url="https://github.com/Martchus/${_reponame}"
@@ -45,6 +46,15 @@ build() {
   make
 }
 
+check() {
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
+  if [[ $TEST_FILE_PATH ]]; then
+    make check
+  else
+    msg2 'Skipping execution of testsuite because the environment variable TESTFILE_PATH is not set.'
+  fi
+}
+
 package() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   make DESTDIR="${pkgdir}" install