6 files changed, 6 insertions, 12 deletions
diff --git a/include/test/compression.h b/include/test/compression.h
index 646f117ed8..02fcfa49f6 100644
--- a/include/test/compression.h
+++ b/include/test/compression.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (c) 2017 Google, Inc
  * Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier:     GPL-2.0+
  */
 
 #ifndef __TEST_COMPRESSION_H__
diff --git a/include/test/env.h b/include/test/env.h
index 2b0cd682e4..f45e33d71a 100644
--- a/include/test/env.h
+++ b/include/test/env.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * (C) Copyright 2015
  * Joe Hershberger, National Instruments, joe.hershberger@ni.com
- *
- * SPDX-License-Identifier:	GPL-2.0
  */
 
 #ifndef __TEST_ENV_H__
diff --git a/include/test/overlay.h b/include/test/overlay.h
index 392f28ff84..c13f4d66e0 100644
--- a/include/test/overlay.h
+++ b/include/test/overlay.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (c) 2016 NextThing Co
  * Copyright (c) 2016 Free Electrons
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef __TEST_OVERLAY_H__
diff --git a/include/test/suites.h b/include/test/suites.h
index 5f2e519084..b5019a7cd2 100644
--- a/include/test/suites.h
+++ b/include/test/suites.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * (C) Copyright 2015
  * Joe Hershberger, National Instruments, joe.hershberger@ni.com
- *
- * SPDX-License-Identifier:	GPL-2.0
  */
 
 #ifndef __TEST_SUITES_H__
diff --git a/include/test/test.h b/include/test/test.h
index 646dbfd486..98fbcd11f6 100644
--- a/include/test/test.h
+++ b/include/test/test.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (c) 2013 Google, Inc.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef __TEST_TEST_H
diff --git a/include/test/ut.h b/include/test/ut.h
index d176df58c7..59b23a25a4 100644
--- a/include/test/ut.h
+++ b/include/test/ut.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Simple unit test library
  *
  * Copyright (c) 2013 Google, Inc
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef __TEST_UT_H