diff --git a/UNITTESTS/features/netsocket/TLSSocket/tls_test_config.h b/UNITTESTS/features/netsocket/TLSSocket/tls_test_config.h
index 35a88ad..4f9ce6b 100644
--- a/UNITTESTS/features/netsocket/TLSSocket/tls_test_config.h
+++ b/UNITTESTS/features/netsocket/TLSSocket/tls_test_config.h
@@ -1,5 +1,18 @@
 /*
- * tls_test_config.h
+ * Copyright (c) 2020, Arm Limited and affiliates.
+ * 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.
  */
 
 #ifndef UNITTESTS_FEATURES_NETSOCKET_TLSSOCKET_TLS_TEST_CONFIG_H_
diff --git a/UNITTESTS/features/netsocket/TLSSocketWrapper/tls_test_config.h b/UNITTESTS/features/netsocket/TLSSocketWrapper/tls_test_config.h
index 35a88ad..4f9ce6b 100644
--- a/UNITTESTS/features/netsocket/TLSSocketWrapper/tls_test_config.h
+++ b/UNITTESTS/features/netsocket/TLSSocketWrapper/tls_test_config.h
@@ -1,5 +1,18 @@
 /*
- * tls_test_config.h
+ * Copyright (c) 2020, Arm Limited and affiliates.
+ * 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.
  */
 
 #ifndef UNITTESTS_FEATURES_NETSOCKET_TLSSOCKET_TLS_TEST_CONFIG_H_
diff --git a/UNITTESTS/stubs/CellularInterface_stub.cpp b/UNITTESTS/stubs/CellularInterface_stub.cpp
index aea3e96..27a4986 100644
--- a/UNITTESTS/stubs/CellularInterface_stub.cpp
+++ b/UNITTESTS/stubs/CellularInterface_stub.cpp
@@ -1,5 +1,6 @@
 /* Socket
  * 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/UNITTESTS/stubs/MeshInterface_stub.cpp b/UNITTESTS/stubs/MeshInterface_stub.cpp
index 039ba86..dd504e5 100644
--- a/UNITTESTS/stubs/MeshInterface_stub.cpp
+++ b/UNITTESTS/stubs/MeshInterface_stub.cpp
@@ -1,5 +1,6 @@
 /* Socket
  * 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/UNITTESTS/stubs/SocketStats_Stub.cpp b/UNITTESTS/stubs/SocketStats_Stub.cpp
index b22ac52..c3fcd23 100644
--- a/UNITTESTS/stubs/SocketStats_Stub.cpp
+++ b/UNITTESTS/stubs/SocketStats_Stub.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * 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/UNITTESTS/stubs/mbed_error.c b/UNITTESTS/stubs/mbed_error.c
index eb0f0b6..ec39fc5 100644
--- a/UNITTESTS/stubs/mbed_error.c
+++ b/UNITTESTS/stubs/mbed_error.c
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2020, Arm Limited and affiliates.
+ * 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.
+ */
 
 int mbed_error(int error_status, const char *error_msg, unsigned int error_value, const char *filename, int line_number)
 {
diff --git a/UNITTESTS/stubs/pwmout_api_stub.c b/UNITTESTS/stubs/pwmout_api_stub.c
index 0c2e321..cf9cce8 100644
--- a/UNITTESTS/stubs/pwmout_api_stub.c
+++ b/UNITTESTS/stubs/pwmout_api_stub.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2019 Arm Limited and affiliates.
+ * 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/UNITTESTS/stubs/watchdog_api_stub.c b/UNITTESTS/stubs/watchdog_api_stub.c
index 666144a..78e0802 100644
--- a/UNITTESTS/stubs/watchdog_api_stub.c
+++ b/UNITTESTS/stubs/watchdog_api_stub.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2018-2019 Arm Limited and affiliates.
+ * 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/UNITTESTS/target_h/platform/mbed_wait_api.h b/UNITTESTS/target_h/platform/mbed_wait_api.h
index e6b21b4..c3ba106 100644
--- a/UNITTESTS/target_h/platform/mbed_wait_api.h
+++ b/UNITTESTS/target_h/platform/mbed_wait_api.h
@@ -1,6 +1,7 @@
 
 /* mbed Microcontroller Library
  * 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/UNITTESTS/target_h/rtos/Thread.h b/UNITTESTS/target_h/rtos/Thread.h
index c0e3ba9..49a7805 100644
--- a/UNITTESTS/target_h/rtos/Thread.h
+++ b/UNITTESTS/target_h/rtos/Thread.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2019 ARM Limited
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/UNITTESTS/template/test_template.cpp b/UNITTESTS/template/test_template.cpp
index a4aa661..f046b40 100644
--- a/UNITTESTS/template/test_template.cpp
+++ b/UNITTESTS/template/test_template.cpp
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2020, Arm Limited and affiliates.
+ * 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 "gtest/gtest.h"
 #include "dirname/template.h"