diff --git a/TESTS/host_tests/crash_reporting.py b/TESTS/host_tests/crash_reporting.py
index a505597389..45bf566c86 100644
--- a/TESTS/host_tests/crash_reporting.py
+++ b/TESTS/host_tests/crash_reporting.py
@@ -1,5 +1,6 @@
 """
 Copyright (c) 2018 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/TESTS/host_tests/device_echo.py b/TESTS/host_tests/device_echo.py
index 03dadaadd9..a6359881a9 100644
--- a/TESTS/host_tests/device_echo.py
+++ b/TESTS/host_tests/device_echo.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2016 ARM Limited
+SPDX-License-Identifier: Apache-2.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/TESTS/host_tests/rtc_calc_auto.py b/TESTS/host_tests/rtc_calc_auto.py
index 65904c912c..2cac67f42e 100644
--- a/TESTS/host_tests/rtc_calc_auto.py
+++ b/TESTS/host_tests/rtc_calc_auto.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/TESTS/host_tests/rtc_reset.py b/TESTS/host_tests/rtc_reset.py
index 3412975a8e..acdb4ccb85 100644
--- a/TESTS/host_tests/rtc_reset.py
+++ b/TESTS/host_tests/rtc_reset.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2017-2017 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/TESTS/host_tests/system_reset.py b/TESTS/host_tests/system_reset.py
index 4093804213..13d2309b3c 100644
--- a/TESTS/host_tests/system_reset.py
+++ b/TESTS/host_tests/system_reset.py
@@ -1,5 +1,6 @@
 """
 Copyright (c) 2018 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/TESTS/host_tests/timing_drift_auto.py b/TESTS/host_tests/timing_drift_auto.py
index 7bf9c1df9c..65ac90a160 100644
--- a/TESTS/host_tests/timing_drift_auto.py
+++ b/TESTS/host_tests/timing_drift_auto.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/TESTS/host_tests/trng_reset.py b/TESTS/host_tests/trng_reset.py
index 3ed59f40ca..64e9501239 100644
--- a/TESTS/host_tests/trng_reset.py
+++ b/TESTS/host_tests/trng_reset.py
@@ -1,5 +1,7 @@
 """
 Copyright (c) 2018 ARM Limited
+SPDX-License-Identifier: Apache-2.
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
diff --git a/TESTS/host_tests/usb_device_hid.py b/TESTS/host_tests/usb_device_hid.py
index 415718f630..3b166bf9c5 100644
--- a/TESTS/host_tests/usb_device_hid.py
+++ b/TESTS/host_tests/usb_device_hid.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2019 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/trng/pithy/pithy.c b/TESTS/mbed_hal/trng/pithy/pithy.c
index a17091d85a..d0581d8440 100644
--- a/TESTS/mbed_hal/trng/pithy/pithy.c
+++ b/TESTS/mbed_hal/trng/pithy/pithy.c
@@ -3,6 +3,7 @@
 //  http://github.com/johnezang/pithy
 //  Licensed under the terms of the BSD License, as specified below.
 //
+// SPDX-License-Identifier: BSD-3-Clause
 
 /*
  Copyright (c) 2011, John Engelhart
diff --git a/TESTS/mbed_hal/trng/pithy/pithy.h b/TESTS/mbed_hal/trng/pithy/pithy.h
index 57fff97088..056ae1aebb 100644
--- a/TESTS/mbed_hal/trng/pithy/pithy.h
+++ b/TESTS/mbed_hal/trng/pithy/pithy.h
@@ -3,6 +3,7 @@
 //  http://github.com/johnezang/pithy
 //  Licensed under the terms of the BSD License, as specified below.
 //
+// SPDX-License-Identifier: BSD-3-Clause
 
 /*
  Copyright (c) 2011, John Engelhart