diff --git a/tests/device/Makefile.inc b/tests/device/Makefile.inc
index f23e72fa32..2bd6bb6a21 100644
--- a/tests/device/Makefile.inc
+++ b/tests/device/Makefile.inc
@@ -1,15 +1,5 @@
-##
-## This file is part of the coreboot project.
-##
-## 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; version 2 of the License.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
+# SPDX-License-Identifier: GPL-2.0-only
+# This file is part of the coreboot project.
 
 tests-y += i2c-test
 
diff --git a/tests/device/i2c-test.c b/tests/device/i2c-test.c
index 16e4d0d1ed..c4fa812d44 100644
--- a/tests/device/i2c-test.c
+++ b/tests/device/i2c-test.c
@@ -1,15 +1,5 @@
-/*
- * This file is part of the coreboot project.
- *
- * 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; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
+/* SPDX-License-Identifier: GPL-2.0-only */
+/* This file is part of the coreboot project. */
 
 #include <stdarg.h>
 #include <stddef.h>
diff --git a/tests/lib/Makefile.inc b/tests/lib/Makefile.inc
index 86ac323ab8..fc2f8bc897 100644
--- a/tests/lib/Makefile.inc
+++ b/tests/lib/Makefile.inc
@@ -1,15 +1,5 @@
-##
-## This file is part of the coreboot project.
-##
-## 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; version 2 of the License.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
+# SPDX-License-Identifier: GPL-2.0-only
+# This file is part of the coreboot project.
 
 # object filest should be under build/tests/ build/test/src/ build/test/run/
 # two examples - first should be simply string.c, second should use -wrap
diff --git a/tests/lib/string-test.c b/tests/lib/string-test.c
index 210aabae4a..5d03d51561 100644
--- a/tests/lib/string-test.c
+++ b/tests/lib/string-test.c
@@ -1,3 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/* This file is part of the coreboot project. */
+
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>