summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
Diffstat (limited to 'src/test')
-rw-r--r--src/test/meson.build2
-rw-r--r--src/test/test-acl-util.c2
-rw-r--r--src/test/test-af-list.c2
-rw-r--r--src/test/test-alloc-util.c2
-rw-r--r--src/test/test-architecture.c2
-rw-r--r--src/test/test-arphrd-list.c2
-rw-r--r--src/test/test-ask-password-api.c2
-rw-r--r--src/test/test-async.c2
-rw-r--r--src/test/test-barrier.c2
-rw-r--r--src/test/test-bitmap.c2
-rw-r--r--src/test/test-boot-timestamps.c2
-rw-r--r--src/test/test-bpf-devices.c2
-rw-r--r--src/test/test-bpf-firewall.c2
-rw-r--r--src/test/test-btrfs.c2
-rw-r--r--src/test/test-bus-util.c2
-rw-r--r--src/test/test-calendarspec.c2
-rw-r--r--src/test/test-cap-list.c2
-rw-r--r--src/test/test-capability.c2
-rw-r--r--src/test/test-cgroup-cpu.c2
-rw-r--r--src/test/test-cgroup-mask.c2
-rw-r--r--src/test/test-cgroup-setup.c2
-rw-r--r--src/test/test-cgroup-unit-default.c2
-rw-r--r--src/test/test-cgroup-util.c2
-rw-r--r--src/test/test-cgroup.c2
-rw-r--r--src/test/test-chase-symlinks.c2
-rw-r--r--src/test/test-chown-rec.c2
-rw-r--r--src/test/test-clock.c2
-rw-r--r--src/test/test-condition.c2
-rw-r--r--src/test/test-conf-files.c2
-rw-r--r--src/test/test-conf-parser.c2
-rw-r--r--src/test/test-copy.c2
-rw-r--r--src/test/test-coredump-util.c2
-rw-r--r--src/test/test-cpu-set-util.c2
-rw-r--r--src/test/test-daemon.c2
-rw-r--r--src/test/test-date.c2
-rw-r--r--src/test/test-dev-setup.c2
-rw-r--r--src/test/test-device-nodes.c2
-rw-r--r--src/test/test-dlopen.c2
-rw-r--r--src/test/test-dns-domain.c2
-rw-r--r--src/test/test-ellipsize.c2
-rw-r--r--src/test/test-emergency-action.c2
-rw-r--r--src/test/test-engine.c2
-rw-r--r--src/test/test-env-file.c2
-rw-r--r--src/test/test-env-util.c2
-rw-r--r--src/test/test-escape.c2
-rw-r--r--src/test/test-exec-util.c2
-rw-r--r--src/test/test-execute.c2
-rw-r--r--src/test/test-exit-status.c2
-rw-r--r--src/test/test-extract-word.c2
-rw-r--r--src/test/test-fd-util.c2
-rw-r--r--src/test/test-fdset.c2
-rw-r--r--src/test/test-fileio.c2
-rw-r--r--src/test/test-firewall-util.c2
-rw-r--r--src/test/test-format-table.c2
-rw-r--r--src/test/test-format-util.c2
-rw-r--r--src/test/test-fs-util.c2
-rw-r--r--src/test/test-fstab-util.c2
-rw-r--r--src/test/test-gcrypt-util.c2
-rw-r--r--src/test/test-glob-util.c2
-rw-r--r--src/test/test-hash.c2
-rw-r--r--src/test/test-hashmap-plain.c2
-rw-r--r--src/test/test-hashmap.c2
-rw-r--r--src/test/test-hexdecoct.c2
-rw-r--r--src/test/test-hostname-util.c2
-rw-r--r--src/test/test-hostname.c2
-rw-r--r--src/test/test-id128.c2
-rw-r--r--src/test/test-in-addr-util.c2
-rw-r--r--src/test/test-install-root.c2
-rw-r--r--src/test/test-install.c2
-rw-r--r--src/test/test-io-util.c2
-rw-r--r--src/test/test-ip-protocol-list.c2
-rw-r--r--src/test/test-ipcrm.c2
-rw-r--r--src/test/test-job-type.c2
-rw-r--r--src/test/test-journal-importer.c2
-rw-r--r--src/test/test-json.c2
-rw-r--r--src/test/test-libcrypt-util.c2
-rw-r--r--src/test/test-libmount.c2
-rw-r--r--src/test/test-libudev.c2
-rw-r--r--src/test/test-list.c2
-rw-r--r--src/test/test-load-fragment.c2
-rw-r--r--src/test/test-local-addresses.c2
-rw-r--r--src/test/test-locale-util.c2
-rw-r--r--src/test/test-log.c2
-rw-r--r--src/test/test-loop-block.c2
-rw-r--r--src/test/test-loopback.c2
-rw-r--r--src/test/test-mount-util.c2
-rw-r--r--src/test/test-mountpoint-util.c2
-rw-r--r--src/test/test-namespace.c2
-rw-r--r--src/test/test-netlink-manual.c2
-rw-r--r--src/test/test-ns.c2
-rw-r--r--src/test/test-nscd-flush.c2
-rw-r--r--src/test/test-nss.c2
-rw-r--r--src/test/test-offline-passwd.c2
-rw-r--r--src/test/test-ordered-set.c2
-rw-r--r--src/test/test-os-util.c2
-rw-r--r--src/test/test-parse-util.c2
-rw-r--r--src/test/test-path-lookup.c2
-rw-r--r--src/test/test-path-util.c2
-rw-r--r--src/test/test-path.c2
-rw-r--r--src/test/test-pretty-print.c2
-rw-r--r--src/test/test-prioq.c2
-rw-r--r--src/test/test-proc-cmdline.c2
-rw-r--r--src/test/test-process-util.c2
-rw-r--r--src/test/test-procfs-util.c2
-rw-r--r--src/test/test-psi-util.c2
-rw-r--r--src/test/test-qrcode-util.c2
-rw-r--r--src/test/test-random-util.c2
-rw-r--r--src/test/test-ratelimit.c2
-rw-r--r--src/test/test-replace-var.c2
-rw-r--r--src/test/test-rlimit-util.c2
-rw-r--r--src/test/test-rm-rf.c2
-rw-r--r--src/test/test-sched-prio.c2
-rw-r--r--src/test/test-sd-hwdb.c2
-rw-r--r--src/test/test-sd-path.c2
-rw-r--r--src/test/test-seccomp.c2
-rw-r--r--src/test/test-selinux.c2
-rw-r--r--src/test/test-serialize.c2
-rw-r--r--src/test/test-set-disable-mempool.c2
-rw-r--r--src/test/test-set.c2
-rw-r--r--src/test/test-sigbus.c2
-rw-r--r--src/test/test-signal-util.c2
-rw-r--r--src/test/test-siphash24.c2
-rw-r--r--src/test/test-sizeof.c2
-rw-r--r--src/test/test-sleep.c2
-rw-r--r--src/test/test-socket-netlink.c2
-rw-r--r--src/test/test-socket-util.c2
-rw-r--r--src/test/test-specifier.c2
-rw-r--r--src/test/test-stat-util.c2
-rw-r--r--src/test/test-static-destruct.c2
-rw-r--r--src/test/test-strbuf.c2
-rw-r--r--src/test/test-string-util.c2
-rw-r--r--src/test/test-strip-tab-ansi.c2
-rw-r--r--src/test/test-strv.c2
-rw-r--r--src/test/test-strxcpyx.c2
-rw-r--r--src/test/test-sysctl-util.c2
-rwxr-xr-xsrc/test/test-systemd-tmpfiles.py2
-rw-r--r--src/test/test-tables.c2
-rw-r--r--src/test/test-terminal-util.c2
-rw-r--r--src/test/test-time-util.c2
-rw-r--r--src/test/test-tmpfiles.c2
-rw-r--r--src/test/test-udev-util.c2
-rw-r--r--src/test/test-udev.c2
-rw-r--r--src/test/test-uid-range.c2
-rw-r--r--src/test/test-umask-util.c2
-rw-r--r--src/test/test-umount.c2
-rw-r--r--src/test/test-unaligned.c2
-rw-r--r--src/test/test-unit-file.c2
-rw-r--r--src/test/test-unit-name.c2
-rw-r--r--src/test/test-user-record.c2
-rw-r--r--src/test/test-user-util.c2
-rw-r--r--src/test/test-utf8.c2
-rw-r--r--src/test/test-util.c2
-rw-r--r--src/test/test-varlink.c2
-rw-r--r--src/test/test-verbs.c2
-rw-r--r--src/test/test-watch-pid.c2
-rw-r--r--src/test/test-watchdog.c2
-rw-r--r--src/test/test-web-util.c2
-rw-r--r--src/test/test-xattr-util.c2
-rw-r--r--src/test/test-xdg-autostart.c2
-rw-r--r--src/test/test-xml.c2
160 files changed, 160 insertions, 160 deletions
diff --git a/src/test/meson.build b/src/test/meson.build
index fd3e53f05b..aed576991f 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
awkscript = 'test-hashmap-ordered.awk'
test_hashmap_ordered_c = custom_target(
diff --git a/src/test/test-acl-util.c b/src/test/test-acl-util.c
index 08764faa4f..37c8265268 100644
--- a/src/test/test-acl-util.c
+++ b/src/test/test-acl-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
#include <stdlib.h>
diff --git a/src/test/test-af-list.c b/src/test/test-af-list.c
index 884372e60e..672dc68be9 100644
--- a/src/test/test-af-list.c
+++ b/src/test/test-af-list.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sys/socket.h>
diff --git a/src/test/test-alloc-util.c b/src/test/test-alloc-util.c
index 72356aeaa4..b4319f9c7d 100644
--- a/src/test/test-alloc-util.c
+++ b/src/test/test-alloc-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <malloc.h>
#include <stdint.h>
diff --git a/src/test/test-architecture.c b/src/test/test-architecture.c
index 8c43bfc750..798c95c0e9 100644
--- a/src/test/test-architecture.c
+++ b/src/test/test-architecture.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "architecture.h"
#include "log.h"
diff --git a/src/test/test-arphrd-list.c b/src/test/test-arphrd-list.c
index d7352b54e0..9e21f32189 100644
--- a/src/test/test-arphrd-list.c
+++ b/src/test/test-arphrd-list.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <linux/if_arp.h>
diff --git a/src/test/test-ask-password-api.c b/src/test/test-ask-password-api.c
index 098bb35bce..06158acf12 100644
--- a/src/test/test-ask-password-api.c
+++ b/src/test/test-ask-password-api.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "ask-password-api.h"
#include "strv.h"
diff --git a/src/test/test-async.c b/src/test/test-async.c
index 7d8accc2fc..8eefad5044 100644
--- a/src/test/test-async.c
+++ b/src/test/test-async.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
#include <unistd.h>
diff --git a/src/test/test-barrier.c b/src/test/test-barrier.c
index 10417f662f..6ef2998a56 100644
--- a/src/test/test-barrier.c
+++ b/src/test/test-barrier.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
* IPC barrier tests
diff --git a/src/test/test-bitmap.c b/src/test/test-bitmap.c
index b281c1ae74..9c5d551d27 100644
--- a/src/test/test-bitmap.c
+++ b/src/test/test-bitmap.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "bitmap.h"
diff --git a/src/test/test-boot-timestamps.c b/src/test/test-boot-timestamps.c
index 29074ecccd..ae5b5821f0 100644
--- a/src/test/test-boot-timestamps.c
+++ b/src/test/test-boot-timestamps.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sys/types.h>
#include <unistd.h>
diff --git a/src/test/test-bpf-devices.c b/src/test/test-bpf-devices.c
index d2740bca73..2c5eb7313b 100644
--- a/src/test/test-bpf-devices.c
+++ b/src/test/test-bpf-devices.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sys/resource.h>
#include <sys/time.h>
diff --git a/src/test/test-bpf-firewall.c b/src/test/test-bpf-firewall.c
index 71aed12558..cb7d8398a8 100644
--- a/src/test/test-bpf-firewall.c
+++ b/src/test/test-bpf-firewall.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <linux/bpf_insn.h>
#include <string.h>
diff --git a/src/test/test-btrfs.c b/src/test/test-btrfs.c
index 9dbe4dccd1..e840536d4b 100644
--- a/src/test/test-btrfs.c
+++ b/src/test/test-btrfs.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
diff --git a/src/test/test-bus-util.c b/src/test/test-bus-util.c
index a536608ce0..0381ba1ee4 100644
--- a/src/test/test-bus-util.c
+++ b/src/test/test-bus-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "bus-util.h"
#include "log.h"
diff --git a/src/test/test-calendarspec.c b/src/test/test-calendarspec.c
index d566638d5d..e0b7f22808 100644
--- a/src/test/test-calendarspec.c
+++ b/src/test/test-calendarspec.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "alloc-util.h"
#include "calendarspec.h"
diff --git a/src/test/test-cap-list.c b/src/test/test-cap-list.c
index 81d5c456d7..c5f429d052 100644
--- a/src/test/test-cap-list.c
+++ b/src/test/test-cap-list.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdio.h>
#include <sys/prctl.h>
diff --git a/src/test/test-capability.c b/src/test/test-capability.c
index 2d47c77f46..0ff56070b1 100644
--- a/src/test/test-capability.c
+++ b/src/test/test-capability.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <netinet/in.h>
#include <pwd.h>
diff --git a/src/test/test-cgroup-cpu.c b/src/test/test-cgroup-cpu.c
index a445acc955..be73be83f8 100644
--- a/src/test/test-cgroup-cpu.c
+++ b/src/test/test-cgroup-cpu.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "cgroup.h"
#include "log.h"
diff --git a/src/test/test-cgroup-mask.c b/src/test/test-cgroup-mask.c
index 27bfcdc17f..b53e327c63 100644
--- a/src/test/test-cgroup-mask.c
+++ b/src/test/test-cgroup-mask.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdio.h>
diff --git a/src/test/test-cgroup-setup.c b/src/test/test-cgroup-setup.c
index 25fa0d75df..72726ca595 100644
--- a/src/test/test-cgroup-setup.c
+++ b/src/test/test-cgroup-setup.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <unistd.h>
diff --git a/src/test/test-cgroup-unit-default.c b/src/test/test-cgroup-unit-default.c
index f4843374ea..b03f6ff12e 100644
--- a/src/test/test-cgroup-unit-default.c
+++ b/src/test/test-cgroup-unit-default.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdio.h>
diff --git a/src/test/test-cgroup-util.c b/src/test/test-cgroup-util.c
index eff586a2e1..41b1df117e 100644
--- a/src/test/test-cgroup-util.c
+++ b/src/test/test-cgroup-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "alloc-util.h"
#include "build.h"
diff --git a/src/test/test-cgroup.c b/src/test/test-cgroup.c
index 4fbb186f52..722e11a0c0 100644
--- a/src/test/test-cgroup.c
+++ b/src/test/test-cgroup.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <unistd.h>
diff --git a/src/test/test-chase-symlinks.c b/src/test/test-chase-symlinks.c
index f7b3dd5e00..d9b9b62dc5 100644
--- a/src/test/test-chase-symlinks.c
+++ b/src/test/test-chase-symlinks.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <getopt.h>
#include "fd-util.h"
diff --git a/src/test/test-chown-rec.c b/src/test/test-chown-rec.c
index aa11bd270f..66c6fd97d1 100644
--- a/src/test/test-chown-rec.c
+++ b/src/test/test-chown-rec.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sys/xattr.h>
#include <unistd.h>
diff --git a/src/test/test-clock.c b/src/test/test-clock.c
index 271d465546..714935cb81 100644
--- a/src/test/test-clock.c
+++ b/src/test/test-clock.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/***
Copyright © 2016 Canonical Ltd.
***/
diff --git a/src/test/test-condition.c b/src/test/test-condition.c
index b42de61200..15099d8df8 100644
--- a/src/test/test-condition.c
+++ b/src/test/test-condition.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdio.h>
#include <sys/types.h>
diff --git a/src/test/test-conf-files.c b/src/test/test-conf-files.c
index f37f32f1b5..ee7bbd1002 100644
--- a/src/test/test-conf-files.c
+++ b/src/test/test-conf-files.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/***
Copyright © 2014 Michael Marineau
***/
diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c
index 07edc17f92..04b610c6f1 100644
--- a/src/test/test-conf-parser.c
+++ b/src/test/test-conf-parser.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "conf-parser.h"
#include "fd-util.h"
diff --git a/src/test/test-copy.c b/src/test/test-copy.c
index 6ed655a358..ffa9297889 100644
--- a/src/test/test-copy.c
+++ b/src/test/test-copy.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sys/xattr.h>
#include <unistd.h>
diff --git a/src/test/test-coredump-util.c b/src/test/test-coredump-util.c
index 14a78007e3..f9a44b2c65 100644
--- a/src/test/test-coredump-util.c
+++ b/src/test/test-coredump-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "alloc-util.h"
#include "coredump-util.h"
diff --git a/src/test/test-cpu-set-util.c b/src/test/test-cpu-set-util.c
index 450e19e06f..0cfc883d66 100644
--- a/src/test/test-cpu-set-util.c
+++ b/src/test/test-cpu-set-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "alloc-util.h"
#include "cpu-set-util.h"
diff --git a/src/test/test-daemon.c b/src/test/test-daemon.c
index 6ca821581f..e6dd29a0a7 100644
--- a/src/test/test-daemon.c
+++ b/src/test/test-daemon.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <unistd.h>
diff --git a/src/test/test-date.c b/src/test/test-date.c
index f39eca6176..47b7096738 100644
--- a/src/test/test-date.c
+++ b/src/test/test-date.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "alloc-util.h"
#include "string-util.h"
diff --git a/src/test/test-dev-setup.c b/src/test/test-dev-setup.c
index 11196cd4d6..ea9df56aeb 100644
--- a/src/test/test-dev-setup.c
+++ b/src/test/test-dev-setup.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "capability-util.h"
#include "dev-setup.h"
diff --git a/src/test/test-device-nodes.c b/src/test/test-device-nodes.c
index ad8d9ace16..9efb3fe3b3 100644
--- a/src/test/test-device-nodes.c
+++ b/src/test/test-device-nodes.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sys/types.h>
diff --git a/src/test/test-dlopen.c b/src/test/test-dlopen.c
index 148ebaa4d0..35981ebc3b 100644
--- a/src/test/test-dlopen.c
+++ b/src/test/test-dlopen.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <dlfcn.h>
#include <stdlib.h>
diff --git a/src/test/test-dns-domain.c b/src/test/test-dns-domain.c
index b73dc56465..2df2380de4 100644
--- a/src/test/test-dns-domain.c
+++ b/src/test/test-dns-domain.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "alloc-util.h"
#include "dns-domain.h"
diff --git a/src/test/test-ellipsize.c b/src/test/test-ellipsize.c
index 92692bd487..a25c0b57bd 100644
--- a/src/test/test-ellipsize.c
+++ b/src/test/test-ellipsize.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdio.h>
diff --git a/src/test/test-emergency-action.c b/src/test/test-emergency-action.c
index 8ce28ed9f5..88214aa7a6 100644
--- a/src/test/test-emergency-action.c
+++ b/src/test/test-emergency-action.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "emergency-action.h"
#include "tests.h"
diff --git a/src/test/test-engine.c b/src/test/test-engine.c
index 6465151b27..cd7cfd9f09 100644
--- a/src/test/test-engine.c
+++ b/src/test/test-engine.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <stdio.h>
diff --git a/src/test/test-env-file.c b/src/test/test-env-file.c
index 23779b9b87..a3acde17ba 100644
--- a/src/test/test-env-file.c
+++ b/src/test/test-env-file.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "env-file.h"
#include "fd-util.h"
diff --git a/src/test/test-env-util.c b/src/test/test-env-util.c
index 7c418209a9..dd150b3068 100644
--- a/src/test/test-env-util.c
+++ b/src/test/test-env-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "env-util.h"
#include "fd-util.h"
diff --git a/src/test/test-escape.c b/src/test/test-escape.c
index 699747fcc3..3e410ca299 100644
--- a/src/test/test-escape.c
+++ b/src/test/test-escape.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "alloc-util.h"
#include "escape.h"
diff --git a/src/test/test-exec-util.c b/src/test/test-exec-util.c
index f5d640a690..5da69f7321 100644
--- a/src/test/test-exec-util.c
+++ b/src/test/test-exec-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <sys/stat.h>
diff --git a/src/test/test-execute.c b/src/test/test-execute.c
index 0bc2a45c30..e15b7a55fa 100644
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdio.h>
#include <sys/prctl.h>
diff --git a/src/test/test-exit-status.c b/src/test/test-exit-status.c
index e90375f6bd..4dc197301d 100644
--- a/src/test/test-exit-status.c
+++ b/src/test/test-exit-status.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "exit-status.h"
#include "string-util.h"
diff --git a/src/test/test-extract-word.c b/src/test/test-extract-word.c
index cc1f29385f..56b516fe40 100644
--- a/src/test/test-extract-word.c
+++ b/src/test/test-extract-word.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <stdlib.h>
diff --git a/src/test/test-fd-util.c b/src/test/test-fd-util.c
index 5351fdb9e9..bece89aef2 100644
--- a/src/test/test-fd-util.c
+++ b/src/test/test-fd-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
#include <unistd.h>
diff --git a/src/test/test-fdset.c b/src/test/test-fdset.c
index 212fe0dbd4..c77d7ffe83 100644
--- a/src/test/test-fdset.c
+++ b/src/test/test-fdset.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
#include <unistd.h>
diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c
index fcc2bc2a8b..431aea07ef 100644
--- a/src/test/test-fileio.c
+++ b/src/test/test-fileio.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
#include <limits.h>
diff --git a/src/test/test-firewall-util.c b/src/test/test-firewall-util.c
index 1788e8d1ca..64616e4391 100644
--- a/src/test/test-firewall-util.c
+++ b/src/test/test-firewall-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "firewall-util.h"
#include "log.h"
diff --git a/src/test/test-format-table.c b/src/test/test-format-table.c
index cf2e34dc9d..24ee1df953 100644
--- a/src/test/test-format-table.c
+++ b/src/test/test-format-table.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <unistd.h>
diff --git a/src/test/test-format-util.c b/src/test/test-format-util.c
index 6558ee2b0a..5562ac8761 100644
--- a/src/test/test-format-util.c
+++ b/src/test/test-format-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "format-util.h"
#include "macro.h"
diff --git a/src/test/test-fs-util.c b/src/test/test-fs-util.c
index f63b1f5d5f..d1f9252521 100644
--- a/src/test/test-fs-util.c
+++ b/src/test/test-fs-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <unistd.h>
diff --git a/src/test/test-fstab-util.c b/src/test/test-fstab-util.c
index f3506045a1..222ffbb2a7 100644
--- a/src/test/test-fstab-util.c
+++ b/src/test/test-fstab-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdio.h>
diff --git a/src/test/test-gcrypt-util.c b/src/test/test-gcrypt-util.c
index b28b4eb5a2..2af040b63a 100644
--- a/src/test/test-gcrypt-util.c
+++ b/src/test/test-gcrypt-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "alloc-util.h"
#include "gcrypt-util.h"
diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c
index 667d15335f..df6444c433 100644
--- a/src/test/test-glob-util.c
+++ b/src/test/test-glob-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
#include <sys/stat.h>
diff --git a/src/test/test-hash.c b/src/test/test-hash.c
index 44d1044bf3..270fcd0df4 100644
--- a/src/test/test-hash.c
+++ b/src/test/test-hash.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <stdio.h>
diff --git a/src/test/test-hashmap-plain.c b/src/test/test-hashmap-plain.c
index 5ff5d096a6..9ed6bee9da 100644
--- a/src/test/test-hashmap-plain.c
+++ b/src/test/test-hashmap-plain.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "alloc-util.h"
#include "hashmap.h"
diff --git a/src/test/test-hashmap.c b/src/test/test-hashmap.c
index 852712844f..20bc97ce58 100644
--- a/src/test/test-hashmap.c
+++ b/src/test/test-hashmap.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "hashmap.h"
#include "string-util.h"
diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c
index 52217429b1..f0f9679769 100644
--- a/src/test/test-hexdecoct.c
+++ b/src/test/test-hexdecoct.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
diff --git a/src/test/test-hostname-util.c b/src/test/test-hostname-util.c
index 5ab82bba61..73839b3115 100644
--- a/src/test/test-hostname-util.c
+++ b/src/test/test-hostname-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <unistd.h>
diff --git a/src/test/test-hostname.c b/src/test/test-hostname.c
index 710c0572e6..1a925f253c 100644
--- a/src/test/test-hostname.c
+++ b/src/test/test-hostname.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "hostname-setup.h"
#include "util.h"
diff --git a/src/test/test-id128.c b/src/test/test-id128.c
index 66eedddce8..a0649b9deb 100644
--- a/src/test/test-id128.c
+++ b/src/test/test-id128.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
#include <sys/types.h>
diff --git a/src/test/test-in-addr-util.c b/src/test/test-in-addr-util.c
index a9ecd0627b..2b6364566b 100644
--- a/src/test/test-in-addr-util.c
+++ b/src/test/test-in-addr-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fnmatch.h>
#include <netinet/in.h>
diff --git a/src/test/test-install-root.c b/src/test/test-install-root.c
index 6fb2fd4298..aedec54a7f 100644
--- a/src/test/test-install-root.c
+++ b/src/test/test-install-root.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <unistd.h>
diff --git a/src/test/test-install.c b/src/test/test-install.c
index f1423fb635..7cd91efcb7 100644
--- a/src/test/test-install.c
+++ b/src/test/test-install.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdio.h>
#include <string.h>
diff --git a/src/test/test-io-util.c b/src/test/test-io-util.c
index 42e632a8a2..104c022cb4 100644
--- a/src/test/test-io-util.c
+++ b/src/test/test-io-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
#include <stdlib.h>
diff --git a/src/test/test-ip-protocol-list.c b/src/test/test-ip-protocol-list.c
index 79390e5289..15bbbdeb72 100644
--- a/src/test/test-ip-protocol-list.c
+++ b/src/test/test-ip-protocol-list.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <netinet/in.h>
diff --git a/src/test/test-ipcrm.c b/src/test/test-ipcrm.c
index 4565d65676..238f0bf666 100644
--- a/src/test/test-ipcrm.c
+++ b/src/test/test-ipcrm.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "clean-ipc.h"
#include "errno-util.h"
diff --git a/src/test/test-job-type.c b/src/test/test-job-type.c
index 33a95c6b52..024d976a75 100644
--- a/src/test/test-job-type.c
+++ b/src/test/test-job-type.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdio.h>
diff --git a/src/test/test-journal-importer.c b/src/test/test-journal-importer.c
index 4883356956..da266d92ac 100644
--- a/src/test/test-journal-importer.c
+++ b/src/test/test-journal-importer.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/src/test/test-json.c b/src/test/test-json.c
index 6da93d6aed..1d4b11945e 100644
--- a/src/test/test-json.c
+++ b/src/test/test-json.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <math.h>
diff --git a/src/test/test-libcrypt-util.c b/src/test/test-libcrypt-util.c
index 58b83b6866..cd296d698e 100644
--- a/src/test/test-libcrypt-util.c
+++ b/src/test/test-libcrypt-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#if HAVE_CRYPT_H
# include <crypt.h>
diff --git a/src/test/test-libmount.c b/src/test/test-libmount.c
index c3395493d4..bd2381f38e 100644
--- a/src/test/test-libmount.c
+++ b/src/test/test-libmount.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "alloc-util.h"
#include "fd-util.h"
diff --git a/src/test/test-libudev.c b/src/test/test-libudev.c
index 2cc679f42e..d162abaea0 100644
--- a/src/test/test-libudev.c
+++ b/src/test/test-libudev.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <getopt.h>
diff --git a/src/test/test-list.c b/src/test/test-list.c
index ca5361adb9..fc6e1c8cd1 100644
--- a/src/test/test-list.c
+++ b/src/test/test-list.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/***
Copyright © 2013 Jan Janssen
***/
diff --git a/src/test/test-load-fragment.c b/src/test/test-load-fragment.c
index 96be244b6b..40c1fd0532 100644
--- a/src/test/test-load-fragment.c
+++ b/src/test/test-load-fragment.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
#include <stddef.h>
diff --git a/src/test/test-local-addresses.c b/src/test/test-local-addresses.c
index 37505ea783..7eeddd28f4 100644
--- a/src/test/test-local-addresses.c
+++ b/src/test/test-local-addresses.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdio.h>
diff --git a/src/test/test-locale-util.c b/src/test/test-locale-util.c
index 347982dd52..62f82200a0 100644
--- a/src/test/test-locale-util.c
+++ b/src/test/test-locale-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "kbd-util.h"
#include "locale-util.h"
diff --git a/src/test/test-log.c b/src/test/test-log.c
index c1f2f8b09d..a2a53730ef 100644
--- a/src/test/test-log.c
+++ b/src/test/test-log.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stddef.h>
#include <unistd.h>
diff --git a/src/test/test-loop-block.c b/src/test/test-loop-block.c
index b9533fc16a..298ded94df 100644
--- a/src/test/test-loop-block.c
+++ b/src/test/test-loop-block.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
#include <linux/loop.h>
diff --git a/src/test/test-loopback.c b/src/test/test-loopback.c
index 89b760fae4..58d8c29dbb 100644
--- a/src/test/test-loopback.c
+++ b/src/test/test-loopback.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdio.h>
#include <string.h>
diff --git a/src/test/test-mount-util.c b/src/test/test-mount-util.c
index 6986405dc6..41df5588d0 100644
--- a/src/test/test-mount-util.c
+++ b/src/test/test-mount-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sys/mount.h>
diff --git a/src/test/test-mountpoint-util.c b/src/test/test-mountpoint-util.c
index ada5b1712c..287488b7c1 100644
--- a/src/test/test-mountpoint-util.c
+++ b/src/test/test-mountpoint-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sched.h>
#include <sys/mount.h>
diff --git a/src/test/test-namespace.c b/src/test/test-namespace.c
index 7571e609a2..e234f54dee 100644
--- a/src/test/test-namespace.c
+++ b/src/test/test-namespace.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
#include <sys/socket.h>
diff --git a/src/test/test-netlink-manual.c b/src/test/test-netlink-manual.c
index a734524eeb..49aca68c49 100644
--- a/src/test/test-netlink-manual.c
+++ b/src/test/test-netlink-manual.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <arpa/inet.h>
#include <linux/if_tunnel.h>
diff --git a/src/test/test-ns.c b/src/test/test-ns.c
index 5d7931f619..6ec1cff28a 100644
--- a/src/test/test-ns.c
+++ b/src/test/test-ns.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <stdlib.h>
diff --git a/src/test/test-nscd-flush.c b/src/test/test-nscd-flush.c
index 97c219596d..1a5a8082f3 100644
--- a/src/test/test-nscd-flush.c
+++ b/src/test/test-nscd-flush.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "main-func.h"
#include "nscd-flush.h"
diff --git a/src/test/test-nss.c b/src/test/test-nss.c
index 293d7a8468..2e9414d16d 100644
--- a/src/test/test-nss.c
+++ b/src/test/test-nss.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <dlfcn.h>
#include <net/if.h>
diff --git a/src/test/test-offline-passwd.c b/src/test/test-offline-passwd.c
index 5933ec28a3..1a961d125b 100644
--- a/src/test/test-offline-passwd.c
+++ b/src/test/test-offline-passwd.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <getopt.h>
diff --git a/src/test/test-ordered-set.c b/src/test/test-ordered-set.c
index 268c54fccc..0fbdd9706f 100644
--- a/src/test/test-ordered-set.c
+++ b/src/test/test-ordered-set.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdio.h>
diff --git a/src/test/test-os-util.c b/src/test/test-os-util.c
index c215a2e99e..ef63026945 100644
--- a/src/test/test-os-util.c
+++ b/src/test/test-os-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
diff --git a/src/test/test-parse-util.c b/src/test/test-parse-util.c
index d4f908f5d4..1c969091ef 100644
--- a/src/test/test-parse-util.c
+++ b/src/test/test-parse-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <linux/loadavg.h>
diff --git a/src/test/test-path-lookup.c b/src/test/test-path-lookup.c
index b9111e9259..da146aac2a 100644
--- a/src/test/test-path-lookup.c
+++ b/src/test/test-path-lookup.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdlib.h>
#include <sys/stat.h>
diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
index e98c19dd6c..36108f548b 100644
--- a/src/test/test-path-util.c
+++ b/src/test/test-path-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdio.h>
#include <unistd.h>
diff --git a/src/test/test-path.c b/src/test/test-path.c
index 2e20674c2f..490fb136a7 100644
--- a/src/test/test-path.c
+++ b/src/test/test-path.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdbool.h>
#include <sys/stat.h>
diff --git a/src/test/test-pretty-print.c b/src/test/test-pretty-print.c
index 9236eb1315..dbae34e73e 100644
--- a/src/test/test-pretty-print.c
+++ b/src/test/test-pretty-print.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdio.h>
#include <sys/stat.h>
diff --git a/src/test/test-prioq.c b/src/test/test-prioq.c
index 50f66cb970..4bfa18195e 100644
--- a/src/test/test-prioq.c
+++ b/src/test/test-prioq.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdlib.h>
diff --git a/src/test/test-proc-cmdline.c b/src/test/test-proc-cmdline.c
index 4a9b111a20..1f5ee7d768 100644
--- a/src/test/test-proc-cmdline.c
+++ b/src/test/test-proc-cmdline.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "alloc-util.h"
#include "env-util.h"
diff --git a/src/test/test-process-util.c b/src/test/test-process-util.c
index b00dd4a980..a87cdf8747 100644
--- a/src/test/test-process-util.c
+++ b/src/test/test-process-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
#include <sys/mount.h>
diff --git a/src/test/test-procfs-util.c b/src/test/test-procfs-util.c
index 61434578b0..b2679e30fb 100644
--- a/src/test/test-procfs-util.c
+++ b/src/test/test-procfs-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
diff --git a/src/test/test-psi-util.c b/src/test/test-psi-util.c
index bde8ef80b1..0b5a30cf57 100644
--- a/src/test/test-psi-util.c
+++ b/src/test/test-psi-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <linux/loadavg.h>
diff --git a/src/test/test-qrcode-util.c b/src/test/test-qrcode-util.c
index c4e2894eb7..221ad854c2 100644
--- a/src/test/test-qrcode-util.c
+++ b/src/test/test-qrcode-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "locale-util.h"
#include "main-func.h"
diff --git a/src/test/test-random-util.c b/src/test/test-random-util.c
index ad5bc72a4e..02a73ecdb2 100644
--- a/src/test/test-random-util.c
+++ b/src/test/test-random-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "hexdecoct.h"
#include "random-util.h"
diff --git a/src/test/test-ratelimit.c b/src/test/test-ratelimit.c
index 56a6fa2d76..af60572e05 100644
--- a/src/test/test-ratelimit.c
+++ b/src/test/test-ratelimit.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <unistd.h>
diff --git a/src/test/test-replace-var.c b/src/test/test-replace-var.c
index 8620e72b2b..4d699b92f0 100644
--- a/src/test/test-replace-var.c
+++ b/src/test/test-replace-var.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdio.h>
diff --git a/src/test/test-rlimit-util.c b/src/test/test-rlimit-util.c
index 90eda96a73..057ae6b2bc 100644
--- a/src/test/test-rlimit-util.c
+++ b/src/test/test-rlimit-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sys/resource.h>
diff --git a/src/test/test-rm-rf.c b/src/test/test-rm-rf.c
index d6e426c0fb..38aa100e0b 100644
--- a/src/test/test-rm-rf.c
+++ b/src/test/test-rm-rf.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <unistd.h>
diff --git a/src/test/test-sched-prio.c b/src/test/test-sched-prio.c
index da6d2a21e6..1f125b1d1e 100644
--- a/src/test/test-sched-prio.c
+++ b/src/test/test-sched-prio.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/***
Copyright © 2012 Holger Hans Peter Freyther
***/
diff --git a/src/test/test-sd-hwdb.c b/src/test/test-sd-hwdb.c
index 8746a841d4..7e1512a97d 100644
--- a/src/test/test-sd-hwdb.c
+++ b/src/test/test-sd-hwdb.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "sd-hwdb.h"
diff --git a/src/test/test-sd-path.c b/src/test/test-sd-path.c
index 9260db5ace..75436ab1ce 100644
--- a/src/test/test-sd-path.c
+++ b/src/test/test-sd-path.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "sd-path.h"
diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c
index 8831d87fe7..853b0ef3b9 100644
--- a/src/test/test-seccomp.c
+++ b/src/test/test-seccomp.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
#include <poll.h>
diff --git a/src/test/test-selinux.c b/src/test/test-selinux.c
index 59b4f71946..3eb7ad30cf 100644
--- a/src/test/test-selinux.c
+++ b/src/test/test-selinux.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sys/stat.h>
diff --git a/src/test/test-serialize.c b/src/test/test-serialize.c
index a57d5db2b1..7bd53a861d 100644
--- a/src/test/test-serialize.c
+++ b/src/test/test-serialize.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "escape.h"
#include "fd-util.h"
diff --git a/src/test/test-set-disable-mempool.c b/src/test/test-set-disable-mempool.c
index aea83d2679..ae36fac102 100644
--- a/src/test/test-set-disable-mempool.c
+++ b/src/test/test-set-disable-mempool.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <pthread.h>
diff --git a/src/test/test-set.c b/src/test/test-set.c
index d3e6de7978..16314d051b 100644
--- a/src/test/test-set.c
+++ b/src/test/test-set.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "set.h"
#include "strv.h"
diff --git a/src/test/test-sigbus.c b/src/test/test-sigbus.c
index f753e3836e..d141735320 100644
--- a/src/test/test-sigbus.c
+++ b/src/test/test-sigbus.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
#include <sys/mman.h>
diff --git a/src/test/test-signal-util.c b/src/test/test-signal-util.c
index 1a8c60ad42..e5096a8c00 100644
--- a/src/test/test-signal-util.c
+++ b/src/test/test-signal-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <unistd.h>
diff --git a/src/test/test-siphash24.c b/src/test/test-siphash24.c
index 6ae272fa94..4a1672fb95 100644
--- a/src/test/test-siphash24.c
+++ b/src/test/test-siphash24.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "memory-util.h"
#include "siphash24.h"
diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c
index 6dee2022e8..3c9dc180fa 100644
--- a/src/test/test-sizeof.c
+++ b/src/test/test-sizeof.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sched.h>
#include <stdio.h>
diff --git a/src/test/test-sleep.c b/src/test/test-sleep.c
index 8b4fa82640..d916254cc9 100644
--- a/src/test/test-sleep.c
+++ b/src/test/test-sleep.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
#include <inttypes.h>
diff --git a/src/test/test-socket-netlink.c b/src/test/test-socket-netlink.c
index afb7038621..704cc01e6f 100644
--- a/src/test/test-socket-netlink.c
+++ b/src/test/test-socket-netlink.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "alloc-util.h"
#include "missing_network.h"
diff --git a/src/test/test-socket-util.c b/src/test/test-socket-util.c
index 1bb186655d..4ff7d714f8 100644
--- a/src/test/test-socket-util.c
+++ b/src/test/test-socket-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
#include <grp.h>
diff --git a/src/test/test-specifier.c b/src/test/test-specifier.c
index e81b12b418..b1e8a61021 100644
--- a/src/test/test-specifier.c
+++ b/src/test/test-specifier.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "alloc-util.h"
#include "log.h"
diff --git a/src/test/test-stat-util.c b/src/test/test-stat-util.c
index 13a66dfb17..9aca09c4de 100644
--- a/src/test/test-stat-util.c
+++ b/src/test/test-stat-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
#include <linux/magic.h>
diff --git a/src/test/test-static-destruct.c b/src/test/test-static-destruct.c
index eb0523d87a..904a9bbf5d 100644
--- a/src/test/test-static-destruct.c
+++ b/src/test/test-static-destruct.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "alloc-util.h"
#include "static-destruct.h"
diff --git a/src/test/test-strbuf.c b/src/test/test-strbuf.c
index 483ba44caa..867be19c86 100644
--- a/src/test/test-strbuf.c
+++ b/src/test/test-strbuf.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdlib.h>
diff --git a/src/test/test-string-util.c b/src/test/test-string-util.c
index 196c96aa8c..b74eb180f3 100644
--- a/src/test/test-string-util.c
+++ b/src/test/test-string-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "alloc-util.h"
#include "locale-util.h"
diff --git a/src/test/test-strip-tab-ansi.c b/src/test/test-strip-tab-ansi.c
index 8e305f3791..be54b0d4d6 100644
--- a/src/test/test-strip-tab-ansi.c
+++ b/src/test/test-strip-tab-ansi.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdio.h>
diff --git a/src/test/test-strv.c b/src/test/test-strv.c
index f681795ebe..0c46af05cc 100644
--- a/src/test/test-strv.c
+++ b/src/test/test-strv.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "alloc-util.h"
#include "escape.h"
diff --git a/src/test/test-strxcpyx.c b/src/test/test-strxcpyx.c
index 749aa46d75..4b6d8ebce3 100644
--- a/src/test/test-strxcpyx.c
+++ b/src/test/test-strxcpyx.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdio.h>
diff --git a/src/test/test-sysctl-util.c b/src/test/test-sysctl-util.c
index 2b957dd4d6..a6f449b764 100644
--- a/src/test/test-sysctl-util.c
+++ b/src/test/test-sysctl-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "strv.h"
#include "sysctl-util.h"
diff --git a/src/test/test-systemd-tmpfiles.py b/src/test/test-systemd-tmpfiles.py
index 7f4af38940..255922d05b 100755
--- a/src/test/test-systemd-tmpfiles.py
+++ b/src/test/test-systemd-tmpfiles.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# systemd is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
diff --git a/src/test/test-tables.c b/src/test/test-tables.c
index 7273611143..e25cf9e5d9 100644
--- a/src/test/test-tables.c
+++ b/src/test/test-tables.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "architecture.h"
#include "automount.h"
diff --git a/src/test/test-terminal-util.c b/src/test/test-terminal-util.c
index 003257111a..508f0c03ee 100644
--- a/src/test/test-terminal-util.c
+++ b/src/test/test-terminal-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
#include <stdbool.h>
diff --git a/src/test/test-time-util.c b/src/test/test-time-util.c
index 64242951ac..cfe8753441 100644
--- a/src/test/test-time-util.c
+++ b/src/test/test-time-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "random-util.h"
#include "serialize.h"
diff --git a/src/test/test-tmpfiles.c b/src/test/test-tmpfiles.c
index b526871655..4c3389af8c 100644
--- a/src/test/test-tmpfiles.c
+++ b/src/test/test-tmpfiles.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
#include <stdio.h>
diff --git a/src/test/test-udev-util.c b/src/test/test-udev-util.c
index c3efdab41a..b0213f8c39 100644
--- a/src/test/test-udev-util.c
+++ b/src/test/test-udev-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdlib.h>
#include <string.h>
diff --git a/src/test/test-udev.c b/src/test/test-udev.c
index 00cab7bb45..8acf86da37 100644
--- a/src/test/test-udev.c
+++ b/src/test/test-udev.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/***
Copyright © 2003-2004 Greg Kroah-Hartman <greg@kroah.com>
***/
diff --git a/src/test/test-uid-range.c b/src/test/test-uid-range.c
index 65a556c9c6..16cbab07d6 100644
--- a/src/test/test-uid-range.c
+++ b/src/test/test-uid-range.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stddef.h>
diff --git a/src/test/test-umask-util.c b/src/test/test-umask-util.c
index 27f6b56541..df3ae98f50 100644
--- a/src/test/test-umask-util.c
+++ b/src/test/test-umask-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "tests.h"
#include "umask-util.h"
diff --git a/src/test/test-umount.c b/src/test/test-umount.c
index 02852bc089..676c6dd862 100644
--- a/src/test/test-umount.c
+++ b/src/test/test-umount.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "alloc-util.h"
#include "errno-util.h"
diff --git a/src/test/test-unaligned.c b/src/test/test-unaligned.c
index 3d6f9a03b4..b4d380b529 100644
--- a/src/test/test-unaligned.c
+++ b/src/test/test-unaligned.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "memory-util.h"
#include "sparse-endian.h"
diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
index d1f85a7f26..8f9679051d 100644
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "path-lookup.h"
#include "set.h"
diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c
index 0d524f9a56..ece78aa548 100644
--- a/src/test/test-unit-name.c
+++ b/src/test/test-unit-name.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/test/test-user-record.c b/src/test/test-user-record.c
index d623706648..c9182e382b 100644
--- a/src/test/test-user-record.c
+++ b/src/test/test-user-record.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <unistd.h>
#include <sys/types.h>
diff --git a/src/test/test-user-util.c b/src/test/test-user-util.c
index 306d08a282..8924b5f95a 100644
--- a/src/test/test-user-util.c
+++ b/src/test/test-user-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "alloc-util.h"
#include "format-util.h"
diff --git a/src/test/test-utf8.c b/src/test/test-utf8.c
index 66003ac13e..c7b6d8dd53 100644
--- a/src/test/test-utf8.c
+++ b/src/test/test-utf8.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "alloc-util.h"
#include "string-util.h"
diff --git a/src/test/test-util.c b/src/test/test-util.c
index cfbafcc5ca..0fe7a381c7 100644
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <sys/wait.h>
diff --git a/src/test/test-varlink.c b/src/test/test-varlink.c
index fbfc72cd81..9a5fbc6c8e 100644
--- a/src/test/test-varlink.c
+++ b/src/test/test-varlink.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
#include <poll.h>
diff --git a/src/test/test-verbs.c b/src/test/test-verbs.c
index 24593c75d9..b7a0cbf527 100644
--- a/src/test/test-verbs.c
+++ b/src/test/test-verbs.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <getopt.h>
diff --git a/src/test/test-watch-pid.c b/src/test/test-watch-pid.c
index 28ecffb0c0..4afc46f10f 100644
--- a/src/test/test-watch-pid.c
+++ b/src/test/test-watch-pid.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "log.h"
#include "manager.h"
diff --git a/src/test/test-watchdog.c b/src/test/test-watchdog.c
index ab66d5c49d..cbef75fe07 100644
--- a/src/test/test-watchdog.c
+++ b/src/test/test-watchdog.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <string.h>
#include <unistd.h>
diff --git a/src/test/test-web-util.c b/src/test/test-web-util.c
index dd1df8c247..853ea9c291 100644
--- a/src/test/test-web-util.c
+++ b/src/test/test-web-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "macro.h"
#include "web-util.h"
diff --git a/src/test/test-xattr-util.c b/src/test/test-xattr-util.c
index 3e6df96c5d..f93aca68f0 100644
--- a/src/test/test-xattr-util.c
+++ b/src/test/test-xattr-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/test/test-xdg-autostart.c b/src/test/test-xdg-autostart.c
index 70287b3c55..a437e2cfed 100644
--- a/src/test/test-xdg-autostart.c
+++ b/src/test/test-xdg-autostart.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "alloc-util.h"
#include "fd-util.h"
diff --git a/src/test/test-xml.c b/src/test/test-xml.c
index 63e7a10e7b..e69d6d0fe4 100644
--- a/src/test/test-xml.c
+++ b/src/test/test-xml.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdarg.h>