diff --git a/README b/README
index a198637d13..9a551f76fa 100644
--- a/README
+++ b/README
@@ -230,7 +230,6 @@ REQUIREMENTS:
         libarchive >= 3.0 (optional)
         libxkbcommon >= 0.3.0 (optional)
         libpcre2 (optional)
-        libgcrypt (optional)
         libqrencode >= 3 (optional)
         libmicrohttpd >= 0.9.33 (optional)
         libcurl >= 7.32.0 (optional)
diff --git a/meson.build b/meson.build
index 943e00bfb2..93df01181b 100644
--- a/meson.build
+++ b/meson.build
@@ -1206,8 +1206,9 @@ libqrencode = dependency('libqrencode',
 libqrencode_cflags = libqrencode.partial_dependency(includes: true, compile_args: true)
 conf.set10('HAVE_QRENCODE', libqrencode.found())
 
+feature = get_option('gcrypt')
 libgcrypt = dependency('libgcrypt',
-                       required : get_option('gcrypt'))
+                       required : feature.disabled() ? feature : false)
 conf.set10('HAVE_GCRYPT', libgcrypt.found())
 if libgcrypt.found()
         libgcrypt_cflags = libgcrypt.partial_dependency(includes: true, compile_args: true)
diff --git a/src/basic/build.c b/src/basic/build.c
index 213ccca5f4..965d4f5a36 100644
--- a/src/basic/build.c
+++ b/src/basic/build.c
@@ -64,12 +64,6 @@ const char* const systemd_features =
 
         /* cryptographic libraries */
 
-#if HAVE_GCRYPT
-        " +GCRYPT"
-#else
-        " -GCRYPT"
-#endif
-
 #if HAVE_GNUTLS
         " +GNUTLS"
 #else
diff --git a/src/shared/meson.build b/src/shared/meson.build
index 24536b87ab..1b1ab668b2 100644
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -87,10 +87,8 @@ shared_sources = files(
         'firewall-util.c',
         'fork-notify.c',
         'format-table.c',
-        'fsprg.c',
         'fsprg-openssl.c',
         'fstab-util.c',
-        'gcrypt-util.c',
         'generator.c',
         'geneve-util.c',
         'gnutls-util.c',
@@ -409,7 +407,6 @@ libshared_deps = [libacl_cflags,
                   libelf_cflags,
                   libfdisk_cflags,
                   libfido2_cflags,
-                  libgcrypt_cflags,
                   libgnutls_cflags,
                   libidn2_cflags,
                   libkmod_cflags,
diff --git a/src/shared/fsprg.c b/src/test/fsprg.c
similarity index 100%
rename from src/shared/fsprg.c
rename to src/test/fsprg.c
diff --git a/src/shared/fsprg.h b/src/test/fsprg.h
similarity index 100%
rename from src/shared/fsprg.h
rename to src/test/fsprg.h
diff --git a/src/shared/gcrypt-util.c b/src/test/gcrypt-util.c
similarity index 100%
rename from src/shared/gcrypt-util.c
rename to src/test/gcrypt-util.c
diff --git a/src/shared/gcrypt-util.h b/src/test/gcrypt-util.h
similarity index 100%
rename from src/shared/gcrypt-util.h
rename to src/test/gcrypt-util.h
diff --git a/src/test/meson.build b/src/test/meson.build
index ff0572fa08..9d5a79c78e 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -300,10 +300,14 @@ executables += [
                 'type' : 'manual',
         },
         test_template + {
-                'sources' : files('test-dlopen-so.c'),
+                'sources' : files(
+                        'test-dlopen-so.c',
+                        'gcrypt-util.c',
+                ),
                 'dependencies' : [
                         libblkid_cflags,
                         libfdisk_cflags,
+                        libgcrypt_cflags,
                         libgnutls_cflags,
                         libkmod_cflags,
                         libmicrohttpd_cflags,
@@ -339,6 +343,8 @@ executables += [
         test_template + {
                 'sources' : files(
                         'test-fsprg.c',
+                        'fsprg.c',
+                        'gcrypt-util.c',
                 ),
                 'dependencies' : [
                         libgcrypt_cflags,