diff --git a/tests/abis/abis_test.c b/tests/abis/abis_test.c
index cb88b01..a631712 100644
--- a/tests/abis/abis_test.c
+++ b/tests/abis/abis_test.c
@@ -1,6 +1,6 @@
 /*
  * (C) 2012 by Holger Hans Peter Freyther <zecke@selfish.org>
- * (C) 2017 by sysmocom s.m.f.c. GmbH <info@sysmocom.de>
+ * (C) 2017 by sysmocom - s.m.f.c. GmbH <info@sysmocom.de>
  * All Rights Reserved
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/tests/codec/codec_test.c b/tests/codec/codec_test.c
index b204d77..7a10fc5 100644
--- a/tests/codec/codec_test.c
+++ b/tests/codec/codec_test.c
@@ -1,10 +1,12 @@
 /*
- * (C) 2016 by Sysmocom s.f.m.c. GmbH
+ * (C) 2016 by sysmocom - s.f.m.c. GmbH
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -12,7 +14,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Affero General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
diff --git a/tests/gb/gprs_bssgp_test.c b/tests/gb/gprs_bssgp_test.c
index 3de05dd..1624a31 100644
--- a/tests/gb/gprs_bssgp_test.c
+++ b/tests/gb/gprs_bssgp_test.c
@@ -1,10 +1,12 @@
 /* Test routines for the BSSGP implementation in libosmogb
  *
- * (C) 2014 by sysmocom s.f.m.c. GmbH
+ * (C) 2014 by sysmocom - s.f.m.c. GmbH
  * Author: Jacob Erlbeck <jerlbeck@sysmocom.de>
  *
  * Skeleton based on bssgp_fc_test.c
  * (C) 2012 by Harald Welte <laforge@gnumonks.org>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #undef _GNU_SOURCE
diff --git a/tests/gb/gprs_ns_test.c b/tests/gb/gprs_ns_test.c
index fac3c36..7e6b85c 100644
--- a/tests/gb/gprs_ns_test.c
+++ b/tests/gb/gprs_ns_test.c
@@ -1,6 +1,8 @@
 /* test routines for NS connection handling
- * (C) 2013 by sysmocom s.f.m.c. GmbH
+ * (C) 2013 by sysmocom - s.f.m.c. GmbH
  * Author: Jacob Erlbeck <jerlbeck@sysmocom.de>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #undef _GNU_SOURCE
diff --git a/tests/gsm23003/gsm23003_test.c b/tests/gsm23003/gsm23003_test.c
index a408b73..64d756d 100644
--- a/tests/gsm23003/gsm23003_test.c
+++ b/tests/gsm23003/gsm23003_test.c
@@ -1,8 +1,9 @@
 /*
  * (C) 2017 by sysmocom s.f.m.c. GmbH <info@sysmocom.de>
+ * Author: Neels Hofmeyr <nhofmeyr@sysmocom.de>
  * All Rights Reserved
  *
- * Author: Neels Hofmeyr <nhofmeyr@sysmocom.de>
+ * SPDX-License-Identifier: GPL-2.0+
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/tests/lapd/lapd_test.c b/tests/lapd/lapd_test.c
index 0dccaa4..d6c0495 100644
--- a/tests/lapd/lapd_test.c
+++ b/tests/lapd/lapd_test.c
@@ -1,9 +1,11 @@
 /*
  * (C) 2011 by Holger Hans Peter Freyther
  * (C) 2011 by On-Waves
- * (C) 2014 by Daniel Willmann <dwillmann@sysmocom.de>
+ * (C) 2014 by sysmocom - s.f.m.c. GmbH, Author: Daniel Willmann <dwillmann@sysmocom.de>
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/tests/oap/oap_test.c b/tests/oap/oap_test.c
index 0c4c16e..dea5c11 100644
--- a/tests/oap/oap_test.c
+++ b/tests/oap/oap_test.c
@@ -1,9 +1,9 @@
 /* Test Osmocom Authentication Protocol */
 /*
- * (C) 2016 by sysmocom s.f.m.c. GmbH
+ * (C) 2016 by sysmocom - s.f.m.c. GmbH
+ * Author: Neels Hofmeyr
  * All Rights Reserved
  *
- * Author: Neels Hofmeyr
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/tests/stats/stats_test.c b/tests/stats/stats_test.c
index 59fc449..b302b37 100644
--- a/tests/stats/stats_test.c
+++ b/tests/stats/stats_test.c
@@ -1,9 +1,11 @@
 /* tests for statistics */
 /*
- * (C) 2015 Sysmocom s.m.f.c. GmbH
+ * (C) 2015 sysmocom - s.m.f.c. GmbH
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/tests/strrb/strrb_test.c b/tests/strrb/strrb_test.c
index 6140ac9..4282d1a 100644
--- a/tests/strrb/strrb_test.c
+++ b/tests/strrb/strrb_test.c
@@ -1,6 +1,8 @@
 /* (C) 2012-2013 by Katerina Barone-Adesi <kat.obsc@gmail.com>
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-3.0+
+ *
  * This program is iree software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
diff --git a/tests/vty/vty_test.c b/tests/vty/vty_test.c
index 2542baf..42646eb 100644
--- a/tests/vty/vty_test.c
+++ b/tests/vty/vty_test.c
@@ -1,9 +1,11 @@
-/* (C) 2013 by Jacob Erlbeck <jerlbeck@sysmocom.de>
+/* (C) 2013 by sysmocom - s.f.m.c. GmbH, Author: Jacob Erlbeck <jerlbeck@sysmocom.de>
  * All Rights Reserved
  *
- * This program is iree software; you can redistribute it and/or modify
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,