diff --git a/meson.build b/meson.build
index 828e66402a..ef1b74b163 100644
--- a/meson.build
+++ b/meson.build
@@ -1301,7 +1301,7 @@ feature = get_option('gcrypt')
 libgcrypt = dependency('libgcrypt',
                        required : feature)
 libgpg_error = dependency('gpg-error',
-                          required : feature.disabled() ? feature : false)
+                          required : feature)
 
 have = libgcrypt.found() and libgpg_error.found()
 if not have
diff --git a/src/import/meson.build b/src/import/meson.build
index 3a50d13b0c..baa12bd490 100644
--- a/src/import/meson.build
+++ b/src/import/meson.build
@@ -101,7 +101,6 @@ executables += [
                 'sources' : files('test-qcow2.c'),
                 'objects' : ['systemd-importd'],
                 'dependencies' : common_deps,
-                'conditions' : ['HAVE_ZLIB'],
                 'type' : 'manual',
         },