diff --git a/tests/migrations/extended-pkf.scm b/tests/migrations/extended-pkf.scm
index 3e76532ba..bf2c49e20 100755
--- a/tests/migrations/extended-pkf.scm
+++ b/tests/migrations/extended-pkf.scm
@@ -19,6 +19,9 @@
 
 (load (with-path "common.scm"))
 
+(catch (skip "gpgtar not built")
+       (call-check `(,GPGTAR --help)))
+
 (define src-tarball (in-srcdir "extended-pkf.tar.asc"))
 
 (define (setup)
diff --git a/tests/migrations/from-classic.scm b/tests/migrations/from-classic.scm
index 2128532d8..d540470c3 100755
--- a/tests/migrations/from-classic.scm
+++ b/tests/migrations/from-classic.scm
@@ -19,6 +19,9 @@
 
 (load (with-path "common.scm"))
 
+(catch (skip "gpgtar not built")
+       (call-check `(,GPGTAR --help)))
+
 (define src-tarball (in-srcdir "from-classic.tar.asc"))
 
 (define (setup)
diff --git a/tests/openpgp/gpgtar.scm b/tests/openpgp/gpgtar.scm
index 07f2fd7f7..15f528f28 100755
--- a/tests/openpgp/gpgtar.scm
+++ b/tests/openpgp/gpgtar.scm
@@ -19,8 +19,8 @@
 
 (load (with-path "defs.scm"))
 
-(unless (= 0 (call `(,(tool 'gpgtar) --help)))
-	(skip "gpgtar not installed"))
+(catch (skip "gpgtar not built")
+       (call-check `(,(tool 'gpgtar) --help)))
 
 (define testfiles (append plain-files data-files))
 (define gpgargs