diff --git a/components/storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_test.c b/components/storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_test.c
index 8c2c22f..cb4a61b 100644
--- a/components/storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_test.c
+++ b/components/storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_test.c
@@ -2,6 +2,7 @@
  *
  * mbed Microcontroller Library
  * Copyright (c) 2006-2016 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/components/storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_test.h b/components/storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_test.h
index b54342c..fb22870 100644
--- a/components/storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_test.h
+++ b/components/storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_test.h
@@ -2,6 +2,7 @@
  *
  * mbed Microcontroller Library
  * Copyright (c) 2006-2016 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/components/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.cpp b/components/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.cpp
index e0c466a..ba9c521 100644
--- a/components/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.cpp
+++ b/components/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.cpp
@@ -1,5 +1,6 @@
 /* Simple access class for I2C EEPROM chips like Microchip 24LC
  * Copyright (c) 2015 Robin Hourahane
+ * 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/components/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.h b/components/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.h
index 4ba2866..7cca151 100644
--- a/components/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.h
+++ b/components/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.h
@@ -1,5 +1,6 @@
 /* Simple access class for I2C EEPROM chips like Microchip 24LC
  * Copyright (c) 2015 Robin Hourahane
+ * 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/components/storage/blockdevice/COMPONENT_I2CEE/TESTS/block_device/i2cee/main.cpp b/components/storage/blockdevice/COMPONENT_I2CEE/TESTS/block_device/i2cee/main.cpp
index dd167d1..ac9772c 100644
--- a/components/storage/blockdevice/COMPONENT_I2CEE/TESTS/block_device/i2cee/main.cpp
+++ b/components/storage/blockdevice/COMPONENT_I2CEE/TESTS/block_device/i2cee/main.cpp
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2020 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 #include "mbed.h"
 #include "greentea-client/test_env.h"
 #include "unity.h"
diff --git a/components/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_test.c b/components/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_test.c
index 4a52c37..01bdc39 100644
--- a/components/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_test.c
+++ b/components/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_test.c
@@ -2,6 +2,7 @@
  *
  * mbed Microcontroller Library
  * Copyright (c) 2006-2016 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/components/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_test.h b/components/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_test.h
index 421c6a2..4c5441e 100644
--- a/components/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_test.h
+++ b/components/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_test.h
@@ -2,6 +2,7 @@
  *
  * mbed Microcontroller Library
  * Copyright (c) 2006-2016 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.