license: Replace Apache boilerplate with SPDX tag

Replace the existing Apache 2.0 boilerplate header with an SPDX tag
throughout the zephyr code tree. This patch was generated via a
script run over the master branch.

Also updated doc/porting/application.rst that had a dependency on
line numbers in a literal include.

Manually updated subsys/logging/sys_log.c that had a malformed
header in the original file.  Also cleanup several cases that already
had a SPDX tag and we either got a duplicate or missed updating.

Jira: ZEP-1457

Change-Id: I6131a1d4ee0e58f5b938300c2d2fc77d2e69572c
Signed-off-by: David B. Kinder <david.b.kinder@intel.com>
Signed-off-by: Kumar Gala <kumar.gala@linaro.org>

246 files changed, 246 insertions, 2709 deletions

diff --git a/tests/Kconfig b/tests/Kconfig
index 18336eb7e..4ac362705 100644
--- a/tests/Kconfig
+++ b/tests/Kconfig
@@ -1,17 +1,7 @@
 #
 # Copyright (c) 2016 Intel Corporation
 #
-# 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.
+# SPDX-License-Identifier: Apache-2.0
 #
 
 menu Testing
diff --git a/tests/bluetooth/init/src/main.c b/tests/bluetooth/init/src/main.c
index f189b776b..2d7e3766c 100644
--- a/tests/bluetooth/init/src/main.c
+++ b/tests/bluetooth/init/src/main.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2015-2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <stdint.h>
diff --git a/tests/bluetooth/shell/Makefile b/tests/bluetooth/shell/Makefile
index b15f9c539..2045635f7 100644
--- a/tests/bluetooth/shell/Makefile
+++ b/tests/bluetooth/shell/Makefile
@@ -3,17 +3,7 @@
 #
 # Copyright (c) 2015-2016 Intel Corporation
 #
-# 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.
+# SPDX-License-Identifier: Apache-2.0
 #
 
 # DESCRIPTION
diff --git a/tests/bluetooth/shell/src/main.c b/tests/bluetooth/shell/src/main.c
index e2e505c07..be8e60c5d 100644
--- a/tests/bluetooth/shell/src/main.c
+++ b/tests/bluetooth/shell/src/main.c
@@ -8,17 +8,7 @@
 /*
  * Copyright (c) 2015-2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <errno.h>
diff --git a/tests/bluetooth/test_bluetooth/src/bluetooth.c b/tests/bluetooth/test_bluetooth/src/bluetooth.c
index 1199131af..98eb49e29 100644
--- a/tests/bluetooth/test_bluetooth/src/bluetooth.c
+++ b/tests/bluetooth/test_bluetooth/src/bluetooth.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2015-2016 Intel Corporation.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/bluetooth/tester/Makefile b/tests/bluetooth/tester/Makefile
index 42212c42b..d52bbd8b6 100644
--- a/tests/bluetooth/tester/Makefile
+++ b/tests/bluetooth/tester/Makefile
@@ -3,17 +3,7 @@
 #
 # Copyright (c) 2015-2016 Intel Corporation
 #
-# 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.
+# SPDX-License-Identifier: Apache-2.0
 #
 
 # DESCRIPTION
diff --git a/tests/bluetooth/tester/src/bttester.c b/tests/bluetooth/tester/src/bttester.c
index 62b518cc9..4eb36b29c 100644
--- a/tests/bluetooth/tester/src/bttester.c
+++ b/tests/bluetooth/tester/src/bttester.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2015-2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/bluetooth/tester/src/bttester.h b/tests/bluetooth/tester/src/bttester.h
index 7c000b906..a75b20980 100644
--- a/tests/bluetooth/tester/src/bttester.h
+++ b/tests/bluetooth/tester/src/bttester.h
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2015-2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <misc/util.h>
diff --git a/tests/bluetooth/tester/src/gap.c b/tests/bluetooth/tester/src/gap.c
index 41a9d604b..4b935f0b8 100644
--- a/tests/bluetooth/tester/src/gap.c
+++ b/tests/bluetooth/tester/src/gap.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2015-2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <atomic.h>
diff --git a/tests/bluetooth/tester/src/gatt.c b/tests/bluetooth/tester/src/gatt.c
index 29707a182..e4e3f351c 100644
--- a/tests/bluetooth/tester/src/gatt.c
+++ b/tests/bluetooth/tester/src/gatt.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2015-2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <stdint.h>
diff --git a/tests/bluetooth/tester/src/l2cap.c b/tests/bluetooth/tester/src/l2cap.c
index c4936c136..51176c13a 100644
--- a/tests/bluetooth/tester/src/l2cap.c
+++ b/tests/bluetooth/tester/src/l2cap.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <bluetooth/bluetooth.h>
diff --git a/tests/bluetooth/tester/src/main.c b/tests/bluetooth/tester/src/main.c
index b2ba52380..5375be8a5 100644
--- a/tests/bluetooth/tester/src/main.c
+++ b/tests/bluetooth/tester/src/main.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2015-2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/booting/stub/src/main.c b/tests/booting/stub/src/main.c
index 3c8522a32..eaa2b7432 100644
--- a/tests/booting/stub/src/main.c
+++ b/tests/booting/stub/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 void main(void)
diff --git a/tests/crypto/test_mbedtls/src/mbedtls_test.c b/tests/crypto/test_mbedtls/src/mbedtls_test.c
index fe7ad6fc2..b96db4609 100644
--- a/tests/crypto/test_mbedtls/src/mbedtls_test.c
+++ b/tests/crypto/test_mbedtls/src/mbedtls_test.c
@@ -1,19 +1,8 @@
 /*  Self-test demonstration program
  *
  *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
- *  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.
+ *  SPDX-License-Identifier: Apache-2.0
  *
  *  This file is part of mbed TLS (https://tls.mbed.org)
  */
diff --git a/tests/drivers/adc/src/main.c b/tests/drivers/adc/src/main.c
index 551c14579..bc25e8aaf 100644
--- a/tests/drivers/adc/src/main.c
+++ b/tests/drivers/adc/src/main.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2015 Intel Corporation.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 #include <ztest.h>
 
diff --git a/tests/drivers/aio/aio_basic_api/src/main.c b/tests/drivers/aio/aio_basic_api/src/main.c
index 62fa57e2f..e7efb0b7a 100644
--- a/tests/drivers/aio/aio_basic_api/src/main.c
+++ b/tests/drivers/aio/aio_basic_api/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/drivers/aio/aio_basic_api/src/test_aio.h b/tests/drivers/aio/aio_basic_api/src/test_aio.h
index 3b7d7e5e4..933641d60 100644
--- a/tests/drivers/aio/aio_basic_api/src/test_aio.h
+++ b/tests/drivers/aio/aio_basic_api/src/test_aio.h
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/drivers/aio/aio_basic_api/src/test_callback.c b/tests/drivers/aio/aio_basic_api/src/test_callback.c
index 0af307f0b..f8f6adfc4 100644
--- a/tests/drivers/aio/aio_basic_api/src/test_callback.c
+++ b/tests/drivers/aio/aio_basic_api/src/test_callback.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include "test_aio.h"
diff --git a/tests/drivers/aon_counter/src/main.c b/tests/drivers/aon_counter/src/main.c
index d6da483e8..520605189 100644
--- a/tests/drivers/aon_counter/src/main.c
+++ b/tests/drivers/aon_counter/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 #include <ztest.h>
 
diff --git a/tests/drivers/build_all/src/main.c b/tests/drivers/build_all/src/main.c
index c2f787ee6..c6d05b983 100644
--- a/tests/drivers/build_all/src/main.c
+++ b/tests/drivers/build_all/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/drivers/dma/test_chan_blen_transfer/src/main.c b/tests/drivers/dma/test_chan_blen_transfer/src/main.c
index 812f3f4a6..1874dbce8 100644
--- a/tests/drivers/dma/test_chan_blen_transfer/src/main.c
+++ b/tests/drivers/dma/test_chan_blen_transfer/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/drivers/dma/test_chan_blen_transfer/src/test_dma.c b/tests/drivers/dma/test_chan_blen_transfer/src/test_dma.c
index f75ca7bf3..c74caaf47 100644
--- a/tests/drivers/dma/test_chan_blen_transfer/src/test_dma.c
+++ b/tests/drivers/dma/test_chan_blen_transfer/src/test_dma.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/drivers/dma/test_loop_transfer/src/dma.c b/tests/drivers/dma/test_loop_transfer/src/dma.c
index 70d2aa0d0..3a032ab32 100644
--- a/tests/drivers/dma/test_loop_transfer/src/dma.c
+++ b/tests/drivers/dma/test_loop_transfer/src/dma.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/drivers/enc28j60/src/main.c b/tests/drivers/enc28j60/src/main.c
index c2f787ee6..c6d05b983 100644
--- a/tests/drivers/enc28j60/src/main.c
+++ b/tests/drivers/enc28j60/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/drivers/gpio/gpio_basic_api/src/main.c b/tests/drivers/gpio/gpio_basic_api/src/main.c
index 66029e3fd..41e895610 100644
--- a/tests/drivers/gpio/gpio_basic_api/src/main.c
+++ b/tests/drivers/gpio/gpio_basic_api/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/drivers/gpio/gpio_basic_api/src/test_callback_manage.c b/tests/drivers/gpio/gpio_basic_api/src/test_callback_manage.c
index 51ad85e1f..5fbec0ff3 100644
--- a/tests/drivers/gpio/gpio_basic_api/src/test_callback_manage.c
+++ b/tests/drivers/gpio/gpio_basic_api/src/test_callback_manage.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/drivers/gpio/gpio_basic_api/src/test_callback_trigger.c b/tests/drivers/gpio/gpio_basic_api/src/test_callback_trigger.c
index 79813af6a..34afea423 100644
--- a/tests/drivers/gpio/gpio_basic_api/src/test_callback_trigger.c
+++ b/tests/drivers/gpio/gpio_basic_api/src/test_callback_trigger.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/drivers/gpio/gpio_basic_api/src/test_gpio.h b/tests/drivers/gpio/gpio_basic_api/src/test_gpio.h
index 12d1d2d00..2b083d167 100644
--- a/tests/drivers/gpio/gpio_basic_api/src/test_gpio.h
+++ b/tests/drivers/gpio/gpio_basic_api/src/test_gpio.h
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2015-2016 Intel Corporation.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #ifndef __TEST_GPIO_H__
diff --git a/tests/drivers/gpio/gpio_basic_api/src/test_pin_rw.c b/tests/drivers/gpio/gpio_basic_api/src/test_pin_rw.c
index c74a7fccf..85da61385 100644
--- a/tests/drivers/gpio/gpio_basic_api/src/test_pin_rw.c
+++ b/tests/drivers/gpio/gpio_basic_api/src/test_pin_rw.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/drivers/nsim_uart/src/main.c b/tests/drivers/nsim_uart/src/main.c
index c2f787ee6..c6d05b983 100644
--- a/tests/drivers/nsim_uart/src/main.c
+++ b/tests/drivers/nsim_uart/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/drivers/pci_enum/src/pci_enum.c b/tests/drivers/pci_enum/src/pci_enum.c
index 0fa7eef23..b6b0e3742 100644
--- a/tests/drivers/pci_enum/src/pci_enum.c
+++ b/tests/drivers/pci_enum/src/pci_enum.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2015 Intel Corporation.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 #include <ztest.h>
 #include <pci/pci.h>
diff --git a/tests/drivers/pinmux/src/main.c b/tests/drivers/pinmux/src/main.c
index b7e013e7a..04bd688f5 100644
--- a/tests/drivers/pinmux/src/main.c
+++ b/tests/drivers/pinmux/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/drivers/pwm/pwm_api/src/main.c b/tests/drivers/pwm/pwm_api/src/main.c
index 1a63ff1bc..94a8dd885 100644
--- a/tests/drivers/pwm/pwm_api/src/main.c
+++ b/tests/drivers/pwm/pwm_api/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/drivers/pwm/pwm_api/src/test_pwm.c b/tests/drivers/pwm/pwm_api/src/test_pwm.c
index 43ead2e3c..8881e047f 100644
--- a/tests/drivers/pwm/pwm_api/src/test_pwm.c
+++ b/tests/drivers/pwm/pwm_api/src/test_pwm.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/drivers/quark_clock/src/main.c b/tests/drivers/quark_clock/src/main.c
index c2f787ee6..c6d05b983 100644
--- a/tests/drivers/quark_clock/src/main.c
+++ b/tests/drivers/quark_clock/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/drivers/rtc/rtc_basic_api/src/main.c b/tests/drivers/rtc/rtc_basic_api/src/main.c
index 1c6e5f5f5..6e8b1b269 100644
--- a/tests/drivers/rtc/rtc_basic_api/src/main.c
+++ b/tests/drivers/rtc/rtc_basic_api/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/drivers/rtc/rtc_basic_api/src/test_rtc.h b/tests/drivers/rtc/rtc_basic_api/src/test_rtc.h
index 845dd3f81..424d3c0fe 100644
--- a/tests/drivers/rtc/rtc_basic_api/src/test_rtc.h
+++ b/tests/drivers/rtc/rtc_basic_api/src/test_rtc.h
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/drivers/rtc/rtc_basic_api/src/test_rtc_alarm.c b/tests/drivers/rtc/rtc_basic_api/src/test_rtc_alarm.c
index 005def8a5..8c7b2e859 100644
--- a/tests/drivers/rtc/rtc_basic_api/src/test_rtc_alarm.c
+++ b/tests/drivers/rtc/rtc_basic_api/src/test_rtc_alarm.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/drivers/rtc/rtc_basic_api/src/test_rtc_calendar.c b/tests/drivers/rtc/rtc_basic_api/src/test_rtc_calendar.c
index ae731bdba..74af35fa5 100644
--- a/tests/drivers/rtc/rtc_basic_api/src/test_rtc_calendar.c
+++ b/tests/drivers/rtc/rtc_basic_api/src/test_rtc_calendar.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/drivers/spi_test/src/spi.c b/tests/drivers/spi_test/src/spi.c
index 7b8257b08..2cd5aa89a 100644
--- a/tests/drivers/spi_test/src/spi.c
+++ b/tests/drivers/spi_test/src/spi.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2015 Intel Corporation.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/drivers/uart/src/main.c b/tests/drivers/uart/src/main.c
index 933ddfad4..5470d4981 100644
--- a/tests/drivers/uart/src/main.c
+++ b/tests/drivers/uart/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <string.h>
diff --git a/tests/drivers/watchdog/wdt_basic_api/src/main.c b/tests/drivers/watchdog/wdt_basic_api/src/main.c
index 0b42e551f..331170d5e 100644
--- a/tests/drivers/watchdog/wdt_basic_api/src/main.c
+++ b/tests/drivers/watchdog/wdt_basic_api/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/drivers/watchdog/wdt_basic_api/src/test_wdt_timeout.c b/tests/drivers/watchdog/wdt_basic_api/src/test_wdt_timeout.c
index 59e6a7756..7940845e4 100644
--- a/tests/drivers/watchdog/wdt_basic_api/src/test_wdt_timeout.c
+++ b/tests/drivers/watchdog/wdt_basic_api/src/test_wdt_timeout.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/fs/fat_fs/src/main.c b/tests/fs/fat_fs/src/main.c
index 6e3175b37..3f961b1d1 100644
--- a/tests/fs/fat_fs/src/main.c
+++ b/tests/fs/fat_fs/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/include/tc_nano_timeout_common.h b/tests/include/tc_nano_timeout_common.h
index 60c35731d..606f80d7f 100644
--- a/tests/include/tc_nano_timeout_common.h
+++ b/tests/include/tc_nano_timeout_common.h
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2015 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #ifndef _samples_include_tc_nano_timeout_common__h_
diff --git a/tests/include/tc_util.h b/tests/include/tc_util.h
index f668759ad..3c89eb406 100644
--- a/tests/include/tc_util.h
+++ b/tests/include/tc_util.h
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2012-2015 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #ifndef __TC_UTIL_H__
diff --git a/tests/include/util_test_common.h b/tests/include/util_test_common.h
index 2b3daf8cc..3a1a98b50 100644
--- a/tests/include/util_test_common.h
+++ b/tests/include/util_test_common.h
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/kernel/alert/test_alert_api/src/main.c b/tests/kernel/alert/test_alert_api/src/main.c
index cfaa501a2..830484d57 100644
--- a/tests/kernel/alert/test_alert_api/src/main.c
+++ b/tests/kernel/alert/test_alert_api/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/kernel/alert/test_alert_api/src/test_alert_contexts.c b/tests/kernel/alert/test_alert_api/src/test_alert_contexts.c
index 6d5da5c3b..8dccf501f 100644
--- a/tests/kernel/alert/test_alert_api/src/test_alert_contexts.c
+++ b/tests/kernel/alert/test_alert_api/src/test_alert_contexts.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/kernel/arm_irq_vector_table/src/main.c b/tests/kernel/arm_irq_vector_table/src/main.c
index a8d8a4f6c..2b801f281 100644
--- a/tests/kernel/arm_irq_vector_table/src/main.c
+++ b/tests/kernel/arm_irq_vector_table/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/kernel/arm_runtime_nmi/src/main.c b/tests/kernel/arm_runtime_nmi/src/main.c
index e09c87cb5..c4fefdeb7 100644
--- a/tests/kernel/arm_runtime_nmi/src/main.c
+++ b/tests/kernel/arm_runtime_nmi/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Linaro Limited
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
  /**
diff --git a/tests/kernel/bitfield/src/bitfield.c b/tests/kernel/bitfield/src/bitfield.c
index 39a117c3e..de9712ede 100644
--- a/tests/kernel/bitfield/src/bitfield.c
+++ b/tests/kernel/bitfield/src/bitfield.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/kernel/common/src/atomic.c b/tests/kernel/common/src/atomic.c
index de7f9fae7..6a6a95831 100644
--- a/tests/kernel/common/src/atomic.c
+++ b/tests/kernel/common/src/atomic.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2015 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <ztest.h>
diff --git a/tests/kernel/common/src/bitfield.c b/tests/kernel/common/src/bitfield.c
index be46b6c54..d2cdf6f60 100644
--- a/tests/kernel/common/src/bitfield.c
+++ b/tests/kernel/common/src/bitfield.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <ztest.h>
diff --git a/tests/kernel/common/src/byteorder.c b/tests/kernel/common/src/byteorder.c
index 22d17f6bd..476f499e9 100644
--- a/tests/kernel/common/src/byteorder.c
+++ b/tests/kernel/common/src/byteorder.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 
diff --git a/tests/kernel/common/src/intmath.c b/tests/kernel/common/src/intmath.c
index 05e2b4a08..a56480d2f 100644
--- a/tests/kernel/common/src/intmath.c
+++ b/tests/kernel/common/src/intmath.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2015 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <ztest.h>
diff --git a/tests/kernel/common/src/main.c b/tests/kernel/common/src/main.c
index 250144fc6..af3ac0ad2 100644
--- a/tests/kernel/common/src/main.c
+++ b/tests/kernel/common/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 
diff --git a/tests/kernel/common/src/printk.c b/tests/kernel/common/src/printk.c
index bad44220f..b28177c9d 100644
--- a/tests/kernel/common/src/printk.c
+++ b/tests/kernel/common/src/printk.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2015 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <ztest.h>
diff --git a/tests/kernel/common/src/rand32.c b/tests/kernel/common/src/rand32.c
index 6450ca016..42ed35964 100644
--- a/tests/kernel/common/src/rand32.c
+++ b/tests/kernel/common/src/rand32.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2015 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/kernel/common/src/ring_buf.c b/tests/kernel/common/src/ring_buf.c
index 4db96f32d..7e469b129 100644
--- a/tests/kernel/common/src/ring_buf.c
+++ b/tests/kernel/common/src/ring_buf.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2015 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <ztest.h>
diff --git a/tests/kernel/common/src/slist.c b/tests/kernel/common/src/slist.c
index f64ba3057..aec5c69a0 100644
--- a/tests/kernel/common/src/slist.c
+++ b/tests/kernel/common/src/slist.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <ztest.h>
diff --git a/tests/kernel/context/src/context.c b/tests/kernel/context/src/context.c
index cd66490a7..cace82008 100644
--- a/tests/kernel/context/src/context.c
+++ b/tests/kernel/context/src/context.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2012-2015 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/kernel/critical/src/critical.c b/tests/kernel/critical/src/critical.c
index 73698cb7b..88894464f 100644
--- a/tests/kernel/critical/src/critical.c
+++ b/tests/kernel/critical/src/critical.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2013-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/kernel/ipm/src/ipm_dummy.c b/tests/kernel/ipm/src/ipm_dummy.c
index 89e6dca8e..e578becea 100644
--- a/tests/kernel/ipm/src/ipm_dummy.c
+++ b/tests/kernel/ipm/src/ipm_dummy.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2015 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/kernel/ipm/src/ipm_dummy.h b/tests/kernel/ipm/src/ipm_dummy.h
index 70c7603b5..6a9a3896d 100644
--- a/tests/kernel/ipm/src/ipm_dummy.h
+++ b/tests/kernel/ipm/src/ipm_dummy.h
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2015 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #ifndef _IPM_DUMMY_H_
diff --git a/tests/kernel/ipm/src/main.c b/tests/kernel/ipm/src/main.c
index 2a0878e8a..ba087e5b5 100644
--- a/tests/kernel/ipm/src/main.c
+++ b/tests/kernel/ipm/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2015 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/kernel/mbox/mbox_api/src/main.c b/tests/kernel/mbox/mbox_api/src/main.c
index b3f8eb597..f25564d81 100644
--- a/tests/kernel/mbox/mbox_api/src/main.c
+++ b/tests/kernel/mbox/mbox_api/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <ztest.h>
diff --git a/tests/kernel/mbox/mbox_api/src/test_mbox_api.c b/tests/kernel/mbox/mbox_api/src/test_mbox_api.c
index a8838b0ea..207b209c3 100644
--- a/tests/kernel/mbox/mbox_api/src/test_mbox_api.c
+++ b/tests/kernel/mbox/mbox_api/src/test_mbox_api.c
@@ -1,18 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/kernel/mem_slab/src/slab.c b/tests/kernel/mem_slab/src/slab.c
index 57e58912a..3104c8958 100644
--- a/tests/kernel/mem_slab/src/slab.c
+++ b/tests/kernel/mem_slab/src/slab.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/kernel/msgq/msgq_api/src/main.c b/tests/kernel/msgq/msgq_api/src/main.c
index d223a5f0e..409c0a6f8 100644
--- a/tests/kernel/msgq/msgq_api/src/main.c
+++ b/tests/kernel/msgq/msgq_api/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/kernel/msgq/msgq_api/src/test_msgq.h b/tests/kernel/msgq/msgq_api/src/test_msgq.h
index 69d212e53..d36401d10 100644
--- a/tests/kernel/msgq/msgq_api/src/test_msgq.h
+++ b/tests/kernel/msgq/msgq_api/src/test_msgq.h
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2015-2016 Intel Corporation.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #ifndef __TEST_MSGQ_H__
diff --git a/tests/kernel/msgq/msgq_api/src/test_msgq_contexts.c b/tests/kernel/msgq/msgq_api/src/test_msgq_contexts.c
index 647d21192..b2ebc110b 100644
--- a/tests/kernel/msgq/msgq_api/src/test_msgq_contexts.c
+++ b/tests/kernel/msgq/msgq_api/src/test_msgq_contexts.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/kernel/msgq/msgq_api/src/test_msgq_fail.c b/tests/kernel/msgq/msgq_api/src/test_msgq_fail.c
index 9f2e494e3..7ffd27894 100644
--- a/tests/kernel/msgq/msgq_api/src/test_msgq_fail.c
+++ b/tests/kernel/msgq/msgq_api/src/test_msgq_fail.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/kernel/msgq/msgq_api/src/test_msgq_purge.c b/tests/kernel/msgq/msgq_api/src/test_msgq_purge.c
index 5ad450abf..38eaef420 100644
--- a/tests/kernel/msgq/msgq_api/src/test_msgq_purge.c
+++ b/tests/kernel/msgq/msgq_api/src/test_msgq_purge.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/kernel/multilib/src/test_multilib.c b/tests/kernel/multilib/src/test_multilib.c
index c109f4046..5f32a93d8 100644
--- a/tests/kernel/multilib/src/test_multilib.c
+++ b/tests/kernel/multilib/src/test_multilib.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Linaro Ltd.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/kernel/mutex/mutex_api/src/main.c b/tests/kernel/mutex/mutex_api/src/main.c
index 6ebc34f0e..0698afc1a 100644
--- a/tests/kernel/mutex/mutex_api/src/main.c
+++ b/tests/kernel/mutex/mutex_api/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/kernel/mutex/mutex_api/src/test_mutex_apis.c b/tests/kernel/mutex/mutex_api/src/test_mutex_apis.c
index 7116f1b12..d62d5c9a8 100644
--- a/tests/kernel/mutex/mutex_api/src/test_mutex_apis.c
+++ b/tests/kernel/mutex/mutex_api/src/test_mutex_apis.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/kernel/semaphore/sema_api/src/main.c b/tests/kernel/semaphore/sema_api/src/main.c
index fbdc83f0e..87f0e7e7b 100644
--- a/tests/kernel/semaphore/sema_api/src/main.c
+++ b/tests/kernel/semaphore/sema_api/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/kernel/semaphore/sema_api/src/test_sema_contexts.c b/tests/kernel/semaphore/sema_api/src/test_sema_contexts.c
index 859845264..98538d182 100644
--- a/tests/kernel/semaphore/sema_api/src/test_sema_contexts.c
+++ b/tests/kernel/semaphore/sema_api/src/test_sema_contexts.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/kernel/sprintf/src/test_sprintf.c b/tests/kernel/sprintf/src/test_sprintf.c
index ed76b86f0..f24574eb3 100644
--- a/tests/kernel/sprintf/src/test_sprintf.c
+++ b/tests/kernel/sprintf/src/test_sprintf.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2013-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/kernel/stack/stack_api/src/main.c b/tests/kernel/stack/stack_api/src/main.c
index 20747f0b0..e0f58b882 100644
--- a/tests/kernel/stack/stack_api/src/main.c
+++ b/tests/kernel/stack/stack_api/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/kernel/stack/stack_api/src/test_stack_contexts.c b/tests/kernel/stack/stack_api/src/test_stack_contexts.c
index 31331c40f..c75df6d6c 100644
--- a/tests/kernel/stack/stack_api/src/test_stack_contexts.c
+++ b/tests/kernel/stack/stack_api/src/test_stack_contexts.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/kernel/stack/stack_api/src/test_stack_fail.c b/tests/kernel/stack/stack_api/src/test_stack_fail.c
index b17ff5e63..4127be4ff 100644
--- a/tests/kernel/stack/stack_api/src/test_stack_fail.c
+++ b/tests/kernel/stack/stack_api/src/test_stack_fail.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/kernel/stackprot/src/main.c b/tests/kernel/stackprot/src/main.c
index db0162a08..e77e3da33 100644
--- a/tests/kernel/stackprot/src/main.c
+++ b/tests/kernel/stackprot/src/main.c
@@ -2,17 +2,7 @@
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 
diff --git a/tests/kernel/threads_lifecycle/lifecycle_api/src/main.c b/tests/kernel/threads_lifecycle/lifecycle_api/src/main.c
index 29beff21e..fe508f424 100644
--- a/tests/kernel/threads_lifecycle/lifecycle_api/src/main.c
+++ b/tests/kernel/threads_lifecycle/lifecycle_api/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/kernel/threads_lifecycle/lifecycle_api/src/test_threads_cancel_abort.c b/tests/kernel/threads_lifecycle/lifecycle_api/src/test_threads_cancel_abort.c
index 2dd86bc29..79e809ff4 100644
--- a/tests/kernel/threads_lifecycle/lifecycle_api/src/test_threads_cancel_abort.c
+++ b/tests/kernel/threads_lifecycle/lifecycle_api/src/test_threads_cancel_abort.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/kernel/threads_lifecycle/lifecycle_api/src/test_threads_spawn.c b/tests/kernel/threads_lifecycle/lifecycle_api/src/test_threads_spawn.c
index b87ee485c..06eddef54 100644
--- a/tests/kernel/threads_lifecycle/lifecycle_api/src/test_threads_spawn.c
+++ b/tests/kernel/threads_lifecycle/lifecycle_api/src/test_threads_spawn.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/kernel/threads_lifecycle/lifecycle_api/src/test_threads_suspend_resume.c b/tests/kernel/threads_lifecycle/lifecycle_api/src/test_threads_suspend_resume.c
index 3a91d51e2..84cccdd63 100644
--- a/tests/kernel/threads_lifecycle/lifecycle_api/src/test_threads_suspend_resume.c
+++ b/tests/kernel/threads_lifecycle/lifecycle_api/src/test_threads_suspend_resume.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/kernel/threads_lifecycle/thread_init/src/main.c b/tests/kernel/threads_lifecycle/thread_init/src/main.c
index 250bceeb3..b136e37fc 100644
--- a/tests/kernel/threads_lifecycle/thread_init/src/main.c
+++ b/tests/kernel/threads_lifecycle/thread_init/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <ztest.h>
diff --git a/tests/kernel/threads_lifecycle/thread_init/src/test_thread_init.c b/tests/kernel/threads_lifecycle/thread_init/src/test_thread_init.c
index c468cb494..64c353c53 100644
--- a/tests/kernel/threads_lifecycle/thread_init/src/test_thread_init.c
+++ b/tests/kernel/threads_lifecycle/thread_init/src/test_thread_init.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/kernel/threads_scheduling/schedule_api/src/main.c b/tests/kernel/threads_scheduling/schedule_api/src/main.c
index f42770cd2..f059bee9c 100644
--- a/tests/kernel/threads_scheduling/schedule_api/src/main.c
+++ b/tests/kernel/threads_scheduling/schedule_api/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/kernel/threads_scheduling/schedule_api/src/test_sched.h b/tests/kernel/threads_scheduling/schedule_api/src/test_sched.h
index a03b33a71..0537089e5 100644
--- a/tests/kernel/threads_scheduling/schedule_api/src/test_sched.h
+++ b/tests/kernel/threads_scheduling/schedule_api/src/test_sched.h
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #ifndef __TEST_SCHED_H__
diff --git a/tests/kernel/threads_scheduling/schedule_api/src/test_sched_priority.c b/tests/kernel/threads_scheduling/schedule_api/src/test_sched_priority.c
index 0388c7f1c..8584129c3 100644
--- a/tests/kernel/threads_scheduling/schedule_api/src/test_sched_priority.c
+++ b/tests/kernel/threads_scheduling/schedule_api/src/test_sched_priority.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/kernel/threads_scheduling/schedule_api/src/test_sched_timeslice_and_lock.c b/tests/kernel/threads_scheduling/schedule_api/src/test_sched_timeslice_and_lock.c
index ec1f8e20c..1c163ebaf 100644
--- a/tests/kernel/threads_scheduling/schedule_api/src/test_sched_timeslice_and_lock.c
+++ b/tests/kernel/threads_scheduling/schedule_api/src/test_sched_timeslice_and_lock.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/kernel/timer/timer_api/src/main.c b/tests/kernel/timer/timer_api/src/main.c
index d4bdd8fa9..dd88c2428 100644
--- a/tests/kernel/timer/timer_api/src/main.c
+++ b/tests/kernel/timer/timer_api/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/kernel/timer/timer_api/src/test_timer.h b/tests/kernel/timer/timer_api/src/test_timer.h
index 6a20421b8..baf7d20d7 100644
--- a/tests/kernel/timer/timer_api/src/test_timer.h
+++ b/tests/kernel/timer/timer_api/src/test_timer.h
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #ifndef __TEST_TIMER_H__
diff --git a/tests/kernel/timer/timer_api/src/test_timer_api.c b/tests/kernel/timer/timer_api/src/test_timer_api.c
index 2adff3fe7..4244530c6 100644
--- a/tests/kernel/timer/timer_api/src/test_timer_api.c
+++ b/tests/kernel/timer/timer_api/src/test_timer_api.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include "test_timer.h"
diff --git a/tests/kernel/workq/workq_api/src/main.c b/tests/kernel/workq/workq_api/src/main.c
index 12995d779..cfc60db36 100644
--- a/tests/kernel/workq/workq_api/src/main.c
+++ b/tests/kernel/workq/workq_api/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <ztest.h>
diff --git a/tests/kernel/workq/workq_api/src/test_workq_api.c b/tests/kernel/workq/workq_api/src/test_workq_api.c
index 425431aaa..c93efb9f2 100644
--- a/tests/kernel/workq/workq_api/src/test_workq_api.c
+++ b/tests/kernel/workq/workq_api/src/test_workq_api.c
@@ -1,18 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/kernel/xip/src/test.h b/tests/kernel/xip/src/test.h
index ae0402281..6f002ebcd 100644
--- a/tests/kernel/xip/src/test.h
+++ b/tests/kernel/xip/src/test.h
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/kernel/xip/src/test_xip.c b/tests/kernel/xip/src/test_xip.c
index 19932d625..649274bc7 100644
--- a/tests/kernel/xip/src/test_xip.c
+++ b/tests/kernel/xip/src/test_xip.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/kernel/xip/src/test_xip_helper.c b/tests/kernel/xip/src/test_xip_helper.c
index 181f70caa..0ebf126a2 100644
--- a/tests/kernel/xip/src/test_xip_helper.c
+++ b/tests/kernel/xip/src/test_xip_helper.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/benchmark/app_kernel/src/config.h b/tests/legacy/benchmark/app_kernel/src/config.h
index 96dd041cc..cce54d285 100644
--- a/tests/legacy/benchmark/app_kernel/src/config.h
+++ b/tests/legacy/benchmark/app_kernel/src/config.h
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 1997-2010, 2014-2015 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #ifndef _CONFIG_H
diff --git a/tests/legacy/benchmark/app_kernel/src/event_b.c b/tests/legacy/benchmark/app_kernel/src/event_b.c
index 374076e4c..525bed7d7 100644
--- a/tests/legacy/benchmark/app_kernel/src/event_b.c
+++ b/tests/legacy/benchmark/app_kernel/src/event_b.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 1997-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include "master.h"
diff --git a/tests/legacy/benchmark/app_kernel/src/fifo_b.c b/tests/legacy/benchmark/app_kernel/src/fifo_b.c
index a19af8169..984a29ba9 100644
--- a/tests/legacy/benchmark/app_kernel/src/fifo_b.c
+++ b/tests/legacy/benchmark/app_kernel/src/fifo_b.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 1997-2010, 2013-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include "master.h"
diff --git a/tests/legacy/benchmark/app_kernel/src/fifo_r.c b/tests/legacy/benchmark/app_kernel/src/fifo_r.c
index 2472cd26c..8fe278805 100644
--- a/tests/legacy/benchmark/app_kernel/src/fifo_r.c
+++ b/tests/legacy/benchmark/app_kernel/src/fifo_r.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 1997-2010, 2013-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include "receiver.h"
diff --git a/tests/legacy/benchmark/app_kernel/src/mailbox_b.c b/tests/legacy/benchmark/app_kernel/src/mailbox_b.c
index 84f2c1753..ca9568db8 100644
--- a/tests/legacy/benchmark/app_kernel/src/mailbox_b.c
+++ b/tests/legacy/benchmark/app_kernel/src/mailbox_b.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 1997-2010, 2013-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include "master.h"
diff --git a/tests/legacy/benchmark/app_kernel/src/mailbox_r.c b/tests/legacy/benchmark/app_kernel/src/mailbox_r.c
index d0aec7f9c..8dece7db4 100644
--- a/tests/legacy/benchmark/app_kernel/src/mailbox_r.c
+++ b/tests/legacy/benchmark/app_kernel/src/mailbox_r.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 1997-2010, 2013-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include "receiver.h"
diff --git a/tests/legacy/benchmark/app_kernel/src/master.c b/tests/legacy/benchmark/app_kernel/src/master.c
index 48f38835f..13f6ca5a4 100644
--- a/tests/legacy/benchmark/app_kernel/src/master.c
+++ b/tests/legacy/benchmark/app_kernel/src/master.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 1997-2010,2013-2015 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/benchmark/app_kernel/src/master.h b/tests/legacy/benchmark/app_kernel/src/master.h
index 6238ae354..568719808 100644
--- a/tests/legacy/benchmark/app_kernel/src/master.h
+++ b/tests/legacy/benchmark/app_kernel/src/master.h
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 1997-2010, 2014-2015 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #ifndef _MASTER_H
diff --git a/tests/legacy/benchmark/app_kernel/src/memcfg.h b/tests/legacy/benchmark/app_kernel/src/memcfg.h
index e0afb4531..18287feb5 100644
--- a/tests/legacy/benchmark/app_kernel/src/memcfg.h
+++ b/tests/legacy/benchmark/app_kernel/src/memcfg.h
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 1997-2010, 2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #ifndef MESSAGE_H
diff --git a/tests/legacy/benchmark/app_kernel/src/memmap_b.c b/tests/legacy/benchmark/app_kernel/src/memmap_b.c
index d5c8d1101..909b33f67 100644
--- a/tests/legacy/benchmark/app_kernel/src/memmap_b.c
+++ b/tests/legacy/benchmark/app_kernel/src/memmap_b.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 1997-2010, 2013-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include "master.h"
diff --git a/tests/legacy/benchmark/app_kernel/src/mempool_b.c b/tests/legacy/benchmark/app_kernel/src/mempool_b.c
index 05c862267..a79404651 100644
--- a/tests/legacy/benchmark/app_kernel/src/mempool_b.c
+++ b/tests/legacy/benchmark/app_kernel/src/mempool_b.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 1997-2010, 2013-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include "master.h"
diff --git a/tests/legacy/benchmark/app_kernel/src/mutex_b.c b/tests/legacy/benchmark/app_kernel/src/mutex_b.c
index 4c6d8bf43..06bf2c4f7 100644
--- a/tests/legacy/benchmark/app_kernel/src/mutex_b.c
+++ b/tests/legacy/benchmark/app_kernel/src/mutex_b.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 1997-2010, 2013-2015 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include "master.h"
diff --git a/tests/legacy/benchmark/app_kernel/src/pipe_b.c b/tests/legacy/benchmark/app_kernel/src/pipe_b.c
index 443127672..532cee917 100644
--- a/tests/legacy/benchmark/app_kernel/src/pipe_b.c
+++ b/tests/legacy/benchmark/app_kernel/src/pipe_b.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 1997-2010, 2013-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include "master.h"
diff --git a/tests/legacy/benchmark/app_kernel/src/pipe_r.c b/tests/legacy/benchmark/app_kernel/src/pipe_r.c
index 2ea644e2b..a61625fad 100644
--- a/tests/legacy/benchmark/app_kernel/src/pipe_r.c
+++ b/tests/legacy/benchmark/app_kernel/src/pipe_r.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 1997-2010, 2013-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include "receiver.h"
diff --git a/tests/legacy/benchmark/app_kernel/src/receiver.c b/tests/legacy/benchmark/app_kernel/src/receiver.c
index 5a88afddd..bf60a1261 100644
--- a/tests/legacy/benchmark/app_kernel/src/receiver.c
+++ b/tests/legacy/benchmark/app_kernel/src/receiver.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 1997-2010,2013-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/benchmark/app_kernel/src/receiver.h b/tests/legacy/benchmark/app_kernel/src/receiver.h
index eaa2065f7..de851d4fa 100644
--- a/tests/legacy/benchmark/app_kernel/src/receiver.h
+++ b/tests/legacy/benchmark/app_kernel/src/receiver.h
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 1997-2010, 2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #ifndef _RECEIVER_H
diff --git a/tests/legacy/benchmark/app_kernel/src/sema_b.c b/tests/legacy/benchmark/app_kernel/src/sema_b.c
index 099b3c461..3dfbc255c 100644
--- a/tests/legacy/benchmark/app_kernel/src/sema_b.c
+++ b/tests/legacy/benchmark/app_kernel/src/sema_b.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 1997-2010, 2013-2015 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include "master.h"
diff --git a/tests/legacy/benchmark/app_kernel/src/sema_r.c b/tests/legacy/benchmark/app_kernel/src/sema_r.c
index dbba8b99f..c8c5e6df7 100644
--- a/tests/legacy/benchmark/app_kernel/src/sema_r.c
+++ b/tests/legacy/benchmark/app_kernel/src/sema_r.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 1997-2010, 2013-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include "receiver.h"
diff --git a/tests/legacy/benchmark/boot_time/microkernel/src/boot_time.c b/tests/legacy/benchmark/boot_time/microkernel/src/boot_time.c
index 1089f49b4..ac6337236 100644
--- a/tests/legacy/benchmark/boot_time/microkernel/src/boot_time.c
+++ b/tests/legacy/benchmark/boot_time/microkernel/src/boot_time.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2013-2015 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/legacy/benchmark/boot_time/nanokernel/src/boot_time.c b/tests/legacy/benchmark/boot_time/nanokernel/src/boot_time.c
index fc4873a48..0dfc79ee2 100644
--- a/tests/legacy/benchmark/boot_time/nanokernel/src/boot_time.c
+++ b/tests/legacy/benchmark/boot_time/nanokernel/src/boot_time.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2013-2015 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/legacy/benchmark/footprint/microkernel/src/microkernel_footprint.c b/tests/legacy/benchmark/footprint/microkernel/src/microkernel_footprint.c
index ed91e9d20..6eade5832 100644
--- a/tests/legacy/benchmark/footprint/microkernel/src/microkernel_footprint.c
+++ b/tests/legacy/benchmark/footprint/microkernel/src/microkernel_footprint.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2013-2015 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/legacy/benchmark/footprint/nanokernel/src/nanokernel_footprint.c b/tests/legacy/benchmark/footprint/nanokernel/src/nanokernel_footprint.c
index ba6967c24..0c4d8da5a 100644
--- a/tests/legacy/benchmark/footprint/nanokernel/src/nanokernel_footprint.c
+++ b/tests/legacy/benchmark/footprint/nanokernel/src/nanokernel_footprint.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2013-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/legacy/benchmark/latency_measure/src/main.c b/tests/legacy/benchmark/latency_measure/src/main.c
index 6979a2557..a7b7ff9f8 100644
--- a/tests/legacy/benchmark/latency_measure/src/main.c
+++ b/tests/legacy/benchmark/latency_measure/src/main.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2012-2015 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/benchmark/latency_measure/src/micro_int_to_task.c b/tests/legacy/benchmark/latency_measure/src/micro_int_to_task.c
index f4f1ae7f7..ae635acc7 100644
--- a/tests/legacy/benchmark/latency_measure/src/micro_int_to_task.c
+++ b/tests/legacy/benchmark/latency_measure/src/micro_int_to_task.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/benchmark/latency_measure/src/micro_int_to_task_evt.c b/tests/legacy/benchmark/latency_measure/src/micro_int_to_task_evt.c
index c346f5a17..6216c8eb5 100644
--- a/tests/legacy/benchmark/latency_measure/src/micro_int_to_task_evt.c
+++ b/tests/legacy/benchmark/latency_measure/src/micro_int_to_task_evt.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/benchmark/latency_measure/src/micro_sema_lock_release.c b/tests/legacy/benchmark/latency_measure/src/micro_sema_lock_release.c
index 2697a2ea2..9c3dcf930 100644
--- a/tests/legacy/benchmark/latency_measure/src/micro_sema_lock_release.c
+++ b/tests/legacy/benchmark/latency_measure/src/micro_sema_lock_release.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2012-2015 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/benchmark/latency_measure/src/micro_task_switch_yield.c b/tests/legacy/benchmark/latency_measure/src/micro_task_switch_yield.c
index a1d55a413..4edf4fada 100644
--- a/tests/legacy/benchmark/latency_measure/src/micro_task_switch_yield.c
+++ b/tests/legacy/benchmark/latency_measure/src/micro_task_switch_yield.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/benchmark/latency_measure/src/nano_ctx_switch.c b/tests/legacy/benchmark/latency_measure/src/nano_ctx_switch.c
index cda573e93..a79271e73 100644
--- a/tests/legacy/benchmark/latency_measure/src/nano_ctx_switch.c
+++ b/tests/legacy/benchmark/latency_measure/src/nano_ctx_switch.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/benchmark/latency_measure/src/nano_int.c b/tests/legacy/benchmark/latency_measure/src/nano_int.c
index 45892ab68..77a69590b 100644
--- a/tests/legacy/benchmark/latency_measure/src/nano_int.c
+++ b/tests/legacy/benchmark/latency_measure/src/nano_int.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/benchmark/latency_measure/src/nano_int_lock_unlock.c b/tests/legacy/benchmark/latency_measure/src/nano_int_lock_unlock.c
index 59c65a408..27707cf55 100644
--- a/tests/legacy/benchmark/latency_measure/src/nano_int_lock_unlock.c
+++ b/tests/legacy/benchmark/latency_measure/src/nano_int_lock_unlock.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/benchmark/latency_measure/src/nano_int_to_fiber.c b/tests/legacy/benchmark/latency_measure/src/nano_int_to_fiber.c
index 0ea118d81..5ce1cf060 100644
--- a/tests/legacy/benchmark/latency_measure/src/nano_int_to_fiber.c
+++ b/tests/legacy/benchmark/latency_measure/src/nano_int_to_fiber.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/benchmark/latency_measure/src/nano_int_to_fiber_sem.c b/tests/legacy/benchmark/latency_measure/src/nano_int_to_fiber_sem.c
index bd271834e..994f8440c 100644
--- a/tests/legacy/benchmark/latency_measure/src/nano_int_to_fiber_sem.c
+++ b/tests/legacy/benchmark/latency_measure/src/nano_int_to_fiber_sem.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/benchmark/latency_measure/src/test_asm_inline_gcc.h b/tests/legacy/benchmark/latency_measure/src/test_asm_inline_gcc.h
index 439ff8922..258a13246 100644
--- a/tests/legacy/benchmark/latency_measure/src/test_asm_inline_gcc.h
+++ b/tests/legacy/benchmark/latency_measure/src/test_asm_inline_gcc.h
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2015, Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #ifndef _TEST_ASM_INLINE_GCC_H
diff --git a/tests/legacy/benchmark/latency_measure/src/timestamp.h b/tests/legacy/benchmark/latency_measure/src/timestamp.h
index c2567c3b1..ed04718ca 100644
--- a/tests/legacy/benchmark/latency_measure/src/timestamp.h
+++ b/tests/legacy/benchmark/latency_measure/src/timestamp.h
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2012-2015 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/benchmark/latency_measure/src/utils.c b/tests/legacy/benchmark/latency_measure/src/utils.c
index 0aa97806b..f7b7366df 100644
--- a/tests/legacy/benchmark/latency_measure/src/utils.c
+++ b/tests/legacy/benchmark/latency_measure/src/utils.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/benchmark/latency_measure/src/utils.h b/tests/legacy/benchmark/latency_measure/src/utils.h
index db6038934..2941b4ea9 100644
--- a/tests/legacy/benchmark/latency_measure/src/utils.h
+++ b/tests/legacy/benchmark/latency_measure/src/utils.h
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/benchmark/object_footprint/src/nanokernel_objects.c b/tests/legacy/benchmark/object_footprint/src/nanokernel_objects.c
index 1bba2b602..91cd72b70 100644
--- a/tests/legacy/benchmark/object_footprint/src/nanokernel_objects.c
+++ b/tests/legacy/benchmark/object_footprint/src/nanokernel_objects.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2015 Intel Corporation.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/legacy/benchmark/sys_kernel/src/lifo.c b/tests/legacy/benchmark/sys_kernel/src/lifo.c
index f63aa35b2..86974af9e 100644
--- a/tests/legacy/benchmark/sys_kernel/src/lifo.c
+++ b/tests/legacy/benchmark/sys_kernel/src/lifo.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 1997-2010, 2013-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include "syskernel.h"
diff --git a/tests/legacy/benchmark/sys_kernel/src/mwfifo.c b/tests/legacy/benchmark/sys_kernel/src/mwfifo.c
index 350477392..7fe7571ce 100644
--- a/tests/legacy/benchmark/sys_kernel/src/mwfifo.c
+++ b/tests/legacy/benchmark/sys_kernel/src/mwfifo.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 1997-2010, 2013-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include "syskernel.h"
diff --git a/tests/legacy/benchmark/sys_kernel/src/sema.c b/tests/legacy/benchmark/sys_kernel/src/sema.c
index 1be61da81..3d8c2dd9b 100644
--- a/tests/legacy/benchmark/sys_kernel/src/sema.c
+++ b/tests/legacy/benchmark/sys_kernel/src/sema.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 1997-2010, 2013-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include "syskernel.h"
diff --git a/tests/legacy/benchmark/sys_kernel/src/stack.c b/tests/legacy/benchmark/sys_kernel/src/stack.c
index 1da546eb2..c477bd003 100644
--- a/tests/legacy/benchmark/sys_kernel/src/stack.c
+++ b/tests/legacy/benchmark/sys_kernel/src/stack.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 1997-2010, 2013-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include "syskernel.h"
diff --git a/tests/legacy/benchmark/sys_kernel/src/syskernel.c b/tests/legacy/benchmark/sys_kernel/src/syskernel.c
index 0c92004bd..37c48585f 100644
--- a/tests/legacy/benchmark/sys_kernel/src/syskernel.c
+++ b/tests/legacy/benchmark/sys_kernel/src/syskernel.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 1997-2010, 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/legacy/benchmark/sys_kernel/src/syskernel.h b/tests/legacy/benchmark/sys_kernel/src/syskernel.h
index 139ff4f45..7df9eaa02 100644
--- a/tests/legacy/benchmark/sys_kernel/src/syskernel.h
+++ b/tests/legacy/benchmark/sys_kernel/src/syskernel.h
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 1997-2010, 2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #ifndef SYSKERNEK_H
diff --git a/tests/legacy/kernel/test_arm_irq_vector_table/src/main.c b/tests/legacy/kernel/test_arm_irq_vector_table/src/main.c
index 573d961d8..29e7f9770 100644
--- a/tests/legacy/kernel/test_arm_irq_vector_table/src/main.c
+++ b/tests/legacy/kernel/test_arm_irq_vector_table/src/main.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/kernel/test_context/src/context.c b/tests/legacy/kernel/test_context/src/context.c
index 108d7500f..0b34123cb 100644
--- a/tests/legacy/kernel/test_context/src/context.c
+++ b/tests/legacy/kernel/test_context/src/context.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2012-2015 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/kernel/test_critical/src/critical.c b/tests/legacy/kernel/test_critical/src/critical.c
index c1467dd5a..8c069024e 100644
--- a/tests/legacy/kernel/test_critical/src/critical.c
+++ b/tests/legacy/kernel/test_critical/src/critical.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2013-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/kernel/test_early_sleep/src/early_sleep.c b/tests/legacy/kernel/test_early_sleep/src/early_sleep.c
index de3d41c9f..a94598f93 100644
--- a/tests/legacy/kernel/test_early_sleep/src/early_sleep.c
+++ b/tests/legacy/kernel/test_early_sleep/src/early_sleep.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/kernel/test_errno/src/main.c b/tests/legacy/kernel/test_errno/src/main.c
index 46633392f..20b5449aa 100644
--- a/tests/legacy/kernel/test_errno/src/main.c
+++ b/tests/legacy/kernel/test_errno/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2015 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/legacy/kernel/test_events/src/events.c b/tests/legacy/kernel/test_events/src/events.c
index cfd030c88..61bc777da 100644
--- a/tests/legacy/kernel/test_events/src/events.c
+++ b/tests/legacy/kernel/test_events/src/events.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/legacy/kernel/test_events/src/test_fiber.c b/tests/legacy/kernel/test_events/src/test_fiber.c
index da594da54..1faa088dc 100644
--- a/tests/legacy/kernel/test_events/src/test_fiber.c
+++ b/tests/legacy/kernel/test_events/src/test_fiber.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/kernel/test_fifo/microkernel/src/fifo.c b/tests/legacy/kernel/test_fifo/microkernel/src/fifo.c
index c2564bfed..a042f848f 100644
--- a/tests/legacy/kernel/test_fifo/microkernel/src/fifo.c
+++ b/tests/legacy/kernel/test_fifo/microkernel/src/fifo.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/legacy/kernel/test_fifo/nanokernel/src/fifo.c b/tests/legacy/kernel/test_fifo/nanokernel/src/fifo.c
index 3b03101f9..33f206986 100644
--- a/tests/legacy/kernel/test_fifo/nanokernel/src/fifo.c
+++ b/tests/legacy/kernel/test_fifo/nanokernel/src/fifo.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/kernel/test_fifo/nanokernel/src/fifo_timeout.c b/tests/legacy/kernel/test_fifo/nanokernel/src/fifo_timeout.c
index ffc545de0..f54c1b8db 100644
--- a/tests/legacy/kernel/test_fifo/nanokernel/src/fifo_timeout.c
+++ b/tests/legacy/kernel/test_fifo/nanokernel/src/fifo_timeout.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2015 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/legacy/kernel/test_fp_sharing/microkernel/src/float_context.h b/tests/legacy/kernel/test_fp_sharing/microkernel/src/float_context.h
index e83889608..b51693d2c 100644
--- a/tests/legacy/kernel/test_fp_sharing/microkernel/src/float_context.h
+++ b/tests/legacy/kernel/test_fp_sharing/microkernel/src/float_context.h
@@ -6,17 +6,7 @@
 /*
  * Copyright (c) 2011-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #ifndef _FLOATCONTEXT_H
diff --git a/tests/legacy/kernel/test_fp_sharing/microkernel/src/float_regs_arm_gcc.h b/tests/legacy/kernel/test_fp_sharing/microkernel/src/float_regs_arm_gcc.h
index c986de6fd..deafff1aa 100644
--- a/tests/legacy/kernel/test_fp_sharing/microkernel/src/float_regs_arm_gcc.h
+++ b/tests/legacy/kernel/test_fp_sharing/microkernel/src/float_regs_arm_gcc.h
@@ -6,17 +6,7 @@
 /*
  * Copyright (c) 2016, Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #ifndef _FLOAT_REGS_ARM_GCC_H
diff --git a/tests/legacy/kernel/test_fp_sharing/microkernel/src/float_regs_x86_gcc.h b/tests/legacy/kernel/test_fp_sharing/microkernel/src/float_regs_x86_gcc.h
index 22551faf9..0995c64b3 100644
--- a/tests/legacy/kernel/test_fp_sharing/microkernel/src/float_regs_x86_gcc.h
+++ b/tests/legacy/kernel/test_fp_sharing/microkernel/src/float_regs_x86_gcc.h
@@ -6,17 +6,7 @@
 /*
  * Copyright (c) 2015, Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #ifndef _FLOAT_REGS_X86_GCC_H
diff --git a/tests/legacy/kernel/test_fp_sharing/microkernel/src/main.c b/tests/legacy/kernel/test_fp_sharing/microkernel/src/main.c
index 08433a3a5..093ceabcb 100644
--- a/tests/legacy/kernel/test_fp_sharing/microkernel/src/main.c
+++ b/tests/legacy/kernel/test_fp_sharing/microkernel/src/main.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2011-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/kernel/test_fp_sharing/microkernel/src/pi.c b/tests/legacy/kernel/test_fp_sharing/microkernel/src/pi.c
index d74ace4d5..6d6a6c623 100644
--- a/tests/legacy/kernel/test_fp_sharing/microkernel/src/pi.c
+++ b/tests/legacy/kernel/test_fp_sharing/microkernel/src/pi.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2011-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/kernel/test_fp_sharing/nanokernel/src/float_context.h b/tests/legacy/kernel/test_fp_sharing/nanokernel/src/float_context.h
index e83889608..b51693d2c 100644
--- a/tests/legacy/kernel/test_fp_sharing/nanokernel/src/float_context.h
+++ b/tests/legacy/kernel/test_fp_sharing/nanokernel/src/float_context.h
@@ -6,17 +6,7 @@
 /*
  * Copyright (c) 2011-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #ifndef _FLOATCONTEXT_H
diff --git a/tests/legacy/kernel/test_fp_sharing/nanokernel/src/float_regs_arm_gcc.h b/tests/legacy/kernel/test_fp_sharing/nanokernel/src/float_regs_arm_gcc.h
index c986de6fd..deafff1aa 100644
--- a/tests/legacy/kernel/test_fp_sharing/nanokernel/src/float_regs_arm_gcc.h
+++ b/tests/legacy/kernel/test_fp_sharing/nanokernel/src/float_regs_arm_gcc.h
@@ -6,17 +6,7 @@
 /*
  * Copyright (c) 2016, Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #ifndef _FLOAT_REGS_ARM_GCC_H
diff --git a/tests/legacy/kernel/test_fp_sharing/nanokernel/src/float_regs_x86_gcc.h b/tests/legacy/kernel/test_fp_sharing/nanokernel/src/float_regs_x86_gcc.h
index 22551faf9..0995c64b3 100644
--- a/tests/legacy/kernel/test_fp_sharing/nanokernel/src/float_regs_x86_gcc.h
+++ b/tests/legacy/kernel/test_fp_sharing/nanokernel/src/float_regs_x86_gcc.h
@@ -6,17 +6,7 @@
 /*
  * Copyright (c) 2015, Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #ifndef _FLOAT_REGS_X86_GCC_H
diff --git a/tests/legacy/kernel/test_fp_sharing/nanokernel/src/main.c b/tests/legacy/kernel/test_fp_sharing/nanokernel/src/main.c
index 3abef8f70..a691b508c 100644
--- a/tests/legacy/kernel/test_fp_sharing/nanokernel/src/main.c
+++ b/tests/legacy/kernel/test_fp_sharing/nanokernel/src/main.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2011-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/kernel/test_fp_sharing/nanokernel/src/pi.c b/tests/legacy/kernel/test_fp_sharing/nanokernel/src/pi.c
index d74ace4d5..6d6a6c623 100644
--- a/tests/legacy/kernel/test_fp_sharing/nanokernel/src/pi.c
+++ b/tests/legacy/kernel/test_fp_sharing/nanokernel/src/pi.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2011-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/kernel/test_irq_offload/src/main.c b/tests/legacy/kernel/test_irq_offload/src/main.c
index b06ed7318..782c377c1 100644
--- a/tests/legacy/kernel/test_irq_offload/src/main.c
+++ b/tests/legacy/kernel/test_irq_offload/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2015 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/legacy/kernel/test_libs/src/libraries.c b/tests/legacy/kernel/test_libs/src/libraries.c
index 4bb9f1eb0..93c38d349 100644
--- a/tests/legacy/kernel/test_libs/src/libraries.c
+++ b/tests/legacy/kernel/test_libs/src/libraries.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/kernel/test_libs/src/main.c b/tests/legacy/kernel/test_libs/src/main.c
index 366555457..1552a78cc 100644
--- a/tests/legacy/kernel/test_libs/src/main.c
+++ b/tests/legacy/kernel/test_libs/src/main.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/kernel/test_lifo/src/lifo.c b/tests/legacy/kernel/test_lifo/src/lifo.c
index 0fa675873..627238383 100644
--- a/tests/legacy/kernel/test_lifo/src/lifo.c
+++ b/tests/legacy/kernel/test_lifo/src/lifo.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2012-2015 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/kernel/test_mail/src/mail.c b/tests/legacy/kernel/test_mail/src/mail.c
index 6e360202f..59718360f 100644
--- a/tests/legacy/kernel/test_mail/src/mail.c
+++ b/tests/legacy/kernel/test_mail/src/mail.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/legacy/kernel/test_mail/src/main.c b/tests/legacy/kernel/test_mail/src/main.c
index fbb58d2b8..0c47b1f22 100644
--- a/tests/legacy/kernel/test_mail/src/main.c
+++ b/tests/legacy/kernel/test_mail/src/main.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2013-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/kernel/test_map/src/map.c b/tests/legacy/kernel/test_map/src/map.c
index a3fc48611..3ca0c07bf 100644
--- a/tests/legacy/kernel/test_map/src/map.c
+++ b/tests/legacy/kernel/test_map/src/map.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/legacy/kernel/test_mem_safe/src/asm_x86.S b/tests/legacy/kernel/test_mem_safe/src/asm_x86.S
index 1e24e11e1..a1e85189c 100644
--- a/tests/legacy/kernel/test_mem_safe/src/asm_x86.S
+++ b/tests/legacy/kernel/test_mem_safe/src/asm_x86.S
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2015 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/legacy/kernel/test_mem_safe/src/main.c b/tests/legacy/kernel/test_mem_safe/src/main.c
index 44fdacc0f..62cba06b0 100644
--- a/tests/legacy/kernel/test_mem_safe/src/main.c
+++ b/tests/legacy/kernel/test_mem_safe/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2015 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/legacy/kernel/test_mutex/src/mutex.c b/tests/legacy/kernel/test_mutex/src/mutex.c
index 0d616cb45..4ab2074b7 100644
--- a/tests/legacy/kernel/test_mutex/src/mutex.c
+++ b/tests/legacy/kernel/test_mutex/src/mutex.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2012-2016 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/legacy/kernel/test_mutex/src/task12.c b/tests/legacy/kernel/test_mutex/src/task12.c
index 0df734d58..40b102f07 100644
--- a/tests/legacy/kernel/test_mutex/src/task12.c
+++ b/tests/legacy/kernel/test_mutex/src/task12.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2015-2016 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/kernel/test_nano_work/src/main.c b/tests/legacy/kernel/test_nano_work/src/main.c
index ff9f05a3f..f038c011b 100644
--- a/tests/legacy/kernel/test_nano_work/src/main.c
+++ b/tests/legacy/kernel/test_nano_work/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <stdbool.h>
diff --git a/tests/legacy/kernel/test_obj_tracing/microkernel/src/object_monitor.c b/tests/legacy/kernel/test_obj_tracing/microkernel/src/object_monitor.c
index 4d716983b..0fa4ed510 100644
--- a/tests/legacy/kernel/test_obj_tracing/microkernel/src/object_monitor.c
+++ b/tests/legacy/kernel/test_obj_tracing/microkernel/src/object_monitor.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/legacy/kernel/test_obj_tracing/microkernel/src/phil.h b/tests/legacy/kernel/test_obj_tracing/microkernel/src/phil.h
index 0bb27cb5a..585074c7d 100644
--- a/tests/legacy/kernel/test_obj_tracing/microkernel/src/phil.h
+++ b/tests/legacy/kernel/test_obj_tracing/microkernel/src/phil.h
@@ -3,16 +3,6 @@
 /*
  * Copyright (c) 2011-2016 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 #define N_PHILOSOPHERS	5
diff --git a/tests/legacy/kernel/test_obj_tracing/microkernel/src/phil_fiber.c b/tests/legacy/kernel/test_obj_tracing/microkernel/src/phil_fiber.c
index 6b272716a..a92d2209b 100644
--- a/tests/legacy/kernel/test_obj_tracing/microkernel/src/phil_fiber.c
+++ b/tests/legacy/kernel/test_obj_tracing/microkernel/src/phil_fiber.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2011-2016 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/legacy/kernel/test_obj_tracing/microkernel/src/phil_task.c b/tests/legacy/kernel/test_obj_tracing/microkernel/src/phil_task.c
index ac11f75d6..0027a80f3 100644
--- a/tests/legacy/kernel/test_obj_tracing/microkernel/src/phil_task.c
+++ b/tests/legacy/kernel/test_obj_tracing/microkernel/src/phil_task.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2011-2016 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/legacy/kernel/test_obj_tracing/nanokernel/src/object_monitor.c b/tests/legacy/kernel/test_obj_tracing/nanokernel/src/object_monitor.c
index 9229b1692..901b0798a 100644
--- a/tests/legacy/kernel/test_obj_tracing/nanokernel/src/object_monitor.c
+++ b/tests/legacy/kernel/test_obj_tracing/nanokernel/src/object_monitor.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/legacy/kernel/test_obj_tracing/nanokernel/src/phil.h b/tests/legacy/kernel/test_obj_tracing/nanokernel/src/phil.h
index 0bb27cb5a..585074c7d 100644
--- a/tests/legacy/kernel/test_obj_tracing/nanokernel/src/phil.h
+++ b/tests/legacy/kernel/test_obj_tracing/nanokernel/src/phil.h
@@ -3,16 +3,6 @@
 /*
  * Copyright (c) 2011-2016 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 #define N_PHILOSOPHERS	5
diff --git a/tests/legacy/kernel/test_obj_tracing/nanokernel/src/phil_fiber.c b/tests/legacy/kernel/test_obj_tracing/nanokernel/src/phil_fiber.c
index 9ab1a09fe..0140609bf 100644
--- a/tests/legacy/kernel/test_obj_tracing/nanokernel/src/phil_fiber.c
+++ b/tests/legacy/kernel/test_obj_tracing/nanokernel/src/phil_fiber.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2011-2016 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/legacy/kernel/test_obj_tracing/nanokernel/src/phil_task.c b/tests/legacy/kernel/test_obj_tracing/nanokernel/src/phil_task.c
index 3a235c993..17b49a5ac 100644
--- a/tests/legacy/kernel/test_obj_tracing/nanokernel/src/phil_task.c
+++ b/tests/legacy/kernel/test_obj_tracing/nanokernel/src/phil_task.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2011-2016 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/legacy/kernel/test_pend/src/pend.c b/tests/legacy/kernel/test_pend/src/pend.c
index fe6704882..f43e73fde 100644
--- a/tests/legacy/kernel/test_pend/src/pend.c
+++ b/tests/legacy/kernel/test_pend/src/pend.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <tc_util.h>
diff --git a/tests/legacy/kernel/test_pipe/src/main.c b/tests/legacy/kernel/test_pipe/src/main.c
index de79a632e..cf008bd50 100644
--- a/tests/legacy/kernel/test_pipe/src/main.c
+++ b/tests/legacy/kernel/test_pipe/src/main.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2013-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/kernel/test_pipe/src/pipe.c b/tests/legacy/kernel/test_pipe/src/pipe.c
index 8709c286c..6f99992d2 100644
--- a/tests/legacy/kernel/test_pipe/src/pipe.c
+++ b/tests/legacy/kernel/test_pipe/src/pipe.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/legacy/kernel/test_pool/src/pool.c b/tests/legacy/kernel/test_pool/src/pool.c
index fd0ce43e4..b221a213a 100644
--- a/tests/legacy/kernel/test_pool/src/pool.c
+++ b/tests/legacy/kernel/test_pool/src/pool.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/kernel/test_sema/microkernel/src/main.c b/tests/legacy/kernel/test_sema/microkernel/src/main.c
index e4778d0e9..12018adbf 100644
--- a/tests/legacy/kernel/test_sema/microkernel/src/main.c
+++ b/tests/legacy/kernel/test_sema/microkernel/src/main.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2013-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/kernel/test_sema/microkernel/src/sema.c b/tests/legacy/kernel/test_sema/microkernel/src/sema.c
index 120bcdcd6..5b7c0243f 100644
--- a/tests/legacy/kernel/test_sema/microkernel/src/sema.c
+++ b/tests/legacy/kernel/test_sema/microkernel/src/sema.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/legacy/kernel/test_sema/microkernel/src/test_fiber.c b/tests/legacy/kernel/test_sema/microkernel/src/test_fiber.c
index 90658bb0c..365f4bfcd 100644
--- a/tests/legacy/kernel/test_sema/microkernel/src/test_fiber.c
+++ b/tests/legacy/kernel/test_sema/microkernel/src/test_fiber.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/kernel/test_sema/nanokernel/src/sema.c b/tests/legacy/kernel/test_sema/nanokernel/src/sema.c
index 1aef3349c..be14b2756 100644
--- a/tests/legacy/kernel/test_sema/nanokernel/src/sema.c
+++ b/tests/legacy/kernel/test_sema/nanokernel/src/sema.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2012-2015 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/kernel/test_sleep/src/sleep.c b/tests/legacy/kernel/test_sleep/src/sleep.c
index ca7ae700a..aff03aa0d 100644
--- a/tests/legacy/kernel/test_sleep/src/sleep.c
+++ b/tests/legacy/kernel/test_sleep/src/sleep.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/kernel/test_stack/nanokernel/src/stack.c b/tests/legacy/kernel/test_stack/nanokernel/src/stack.c
index cd0d0ec1b..7c3c6a3d9 100644
--- a/tests/legacy/kernel/test_stack/nanokernel/src/stack.c
+++ b/tests/legacy/kernel/test_stack/nanokernel/src/stack.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/kernel/test_stackprot/microkernel/src/stackprot.c b/tests/legacy/kernel/test_stackprot/microkernel/src/stackprot.c
index 625dfa0f6..86a87d8af 100644
--- a/tests/legacy/kernel/test_stackprot/microkernel/src/stackprot.c
+++ b/tests/legacy/kernel/test_stackprot/microkernel/src/stackprot.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 
diff --git a/tests/legacy/kernel/test_stackprot/nanokernel/src/stackprot.c b/tests/legacy/kernel/test_stackprot/nanokernel/src/stackprot.c
index 1ec088952..8a229f7db 100644
--- a/tests/legacy/kernel/test_stackprot/nanokernel/src/stackprot.c
+++ b/tests/legacy/kernel/test_stackprot/nanokernel/src/stackprot.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 
diff --git a/tests/legacy/kernel/test_static_idt/microkernel/src/static_idt.c b/tests/legacy/kernel/test_static_idt/microkernel/src/static_idt.c
index 7d5d618d4..90e644f21 100644
--- a/tests/legacy/kernel/test_static_idt/microkernel/src/static_idt.c
+++ b/tests/legacy/kernel/test_static_idt/microkernel/src/static_idt.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/kernel/test_static_idt/microkernel/src/test_asm_inline_gcc.h b/tests/legacy/kernel/test_static_idt/microkernel/src/test_asm_inline_gcc.h
index 31172528b..a39181442 100644
--- a/tests/legacy/kernel/test_static_idt/microkernel/src/test_asm_inline_gcc.h
+++ b/tests/legacy/kernel/test_static_idt/microkernel/src/test_asm_inline_gcc.h
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2015, Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #ifndef _TEST_ASM_INLINE_GCC_H
diff --git a/tests/legacy/kernel/test_static_idt/microkernel/src/test_stubs.S b/tests/legacy/kernel/test_static_idt/microkernel/src/test_stubs.S
index b104d840c..69fd54621 100644
--- a/tests/legacy/kernel/test_static_idt/microkernel/src/test_stubs.S
+++ b/tests/legacy/kernel/test_static_idt/microkernel/src/test_stubs.S
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/kernel/test_static_idt/nanokernel/src/static_idt.c b/tests/legacy/kernel/test_static_idt/nanokernel/src/static_idt.c
index ad0c2c9ef..ef478614d 100644
--- a/tests/legacy/kernel/test_static_idt/nanokernel/src/static_idt.c
+++ b/tests/legacy/kernel/test_static_idt/nanokernel/src/static_idt.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/kernel/test_static_idt/nanokernel/src/test_asm_inline_gcc.h b/tests/legacy/kernel/test_static_idt/nanokernel/src/test_asm_inline_gcc.h
index 31172528b..a39181442 100644
--- a/tests/legacy/kernel/test_static_idt/nanokernel/src/test_asm_inline_gcc.h
+++ b/tests/legacy/kernel/test_static_idt/nanokernel/src/test_asm_inline_gcc.h
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2015, Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #ifndef _TEST_ASM_INLINE_GCC_H
diff --git a/tests/legacy/kernel/test_static_idt/nanokernel/src/test_stubs.S b/tests/legacy/kernel/test_static_idt/nanokernel/src/test_stubs.S
index b104d840c..69fd54621 100644
--- a/tests/legacy/kernel/test_static_idt/nanokernel/src/test_stubs.S
+++ b/tests/legacy/kernel/test_static_idt/nanokernel/src/test_stubs.S
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/kernel/test_task/src/task.c b/tests/legacy/kernel/test_task/src/task.c
index 18ae03bfe..796ff8ae5 100644
--- a/tests/legacy/kernel/test_task/src/task.c
+++ b/tests/legacy/kernel/test_task/src/task.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/kernel/test_tickless/microkernel/src/test_tickless.c b/tests/legacy/kernel/test_tickless/microkernel/src/test_tickless.c
index 37c43f4d3..e3bda2d1a 100644
--- a/tests/legacy/kernel/test_tickless/microkernel/src/test_tickless.c
+++ b/tests/legacy/kernel/test_tickless/microkernel/src/test_tickless.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2011, 2013-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/kernel/test_tickless/microkernel/src/timestamps.c b/tests/legacy/kernel/test_tickless/microkernel/src/timestamps.c
index 0d944cba8..d9ded1453 100644
--- a/tests/legacy/kernel/test_tickless/microkernel/src/timestamps.c
+++ b/tests/legacy/kernel/test_tickless/microkernel/src/timestamps.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/kernel/test_timer/microkernel/src/timer.c b/tests/legacy/kernel/test_timer/microkernel/src/timer.c
index f92a01d3d..82933ffd0 100644
--- a/tests/legacy/kernel/test_timer/microkernel/src/timer.c
+++ b/tests/legacy/kernel/test_timer/microkernel/src/timer.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2013-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/legacy/kernel/test_timer/nanokernel/src/timer.c b/tests/legacy/kernel/test_timer/nanokernel/src/timer.c
index fbc0dfad2..57f91fb6b 100644
--- a/tests/legacy/kernel/test_timer/nanokernel/src/timer.c
+++ b/tests/legacy/kernel/test_timer/nanokernel/src/timer.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2012-2015 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/tests/net/6lo/src/main.c b/tests/net/6lo/src/main.c
index c15df7a71..b666326a1 100644
--- a/tests/net/6lo/src/main.c
+++ b/tests/net/6lo/src/main.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/net/arp/src/main.c b/tests/net/arp/src/main.c
index 699c68db5..088e380d3 100644
--- a/tests/net/arp/src/main.c
+++ b/tests/net/arp/src/main.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/net/buf/src/main.c b/tests/net/buf/src/main.c
index e5016a125..6f08509d6 100644
--- a/tests/net/buf/src/main.c
+++ b/tests/net/buf/src/main.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2015 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <stdint.h>
diff --git a/tests/net/context/src/main.c b/tests/net/context/src/main.c
index bea1c17e2..76d2df3b8 100644
--- a/tests/net/context/src/main.c
+++ b/tests/net/context/src/main.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2015 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <stdint.h>
diff --git a/tests/net/dhcpv4/src/main.c b/tests/net/dhcpv4/src/main.c
index 595df9b59..84a4733c5 100644
--- a/tests/net/dhcpv4/src/main.c
+++ b/tests/net/dhcpv4/src/main.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/net/icmpv6/src/main.c b/tests/net/icmpv6/src/main.c
index 0e33584db..7a721cbae 100644
--- a/tests/net/icmpv6/src/main.c
+++ b/tests/net/icmpv6/src/main.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <errno.h>
diff --git a/tests/net/ieee802154/fragment/src/main.c b/tests/net/ieee802154/fragment/src/main.c
index e631303b9..76106e5d1 100644
--- a/tests/net/ieee802154/fragment/src/main.c
+++ b/tests/net/ieee802154/fragment/src/main.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/net/ieee802154/l2/src/ieee802154_fake_driver.c b/tests/net/ieee802154/l2/src/ieee802154_fake_driver.c
index 6911ec1e0..e395ba018 100644
--- a/tests/net/ieee802154/l2/src/ieee802154_fake_driver.c
+++ b/tests/net/ieee802154/l2/src/ieee802154_fake_driver.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/net/ieee802154/l2/src/ieee802154_test.c b/tests/net/ieee802154/l2/src/ieee802154_test.c
index d7393016b..2457c3a8a 100644
--- a/tests/net/ieee802154/l2/src/ieee802154_test.c
+++ b/tests/net/ieee802154/l2/src/ieee802154_test.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/net/ip-addr/src/main.c b/tests/net/ip-addr/src/main.c
index aa8457b1c..13a36f20e 100644
--- a/tests/net/ip-addr/src/main.c
+++ b/tests/net/ip-addr/src/main.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <stdint.h>
diff --git a/tests/net/ipv6/src/main.c b/tests/net/ipv6/src/main.c
index fea0803e1..db8f64d7f 100644
--- a/tests/net/ipv6/src/main.c
+++ b/tests/net/ipv6/src/main.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2015 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <stdint.h>
diff --git a/tests/net/lib/http_header_fields/Makefile b/tests/net/lib/http_header_fields/Makefile
index 4136dcf91..8d1ab8fa6 100644
--- a/tests/net/lib/http_header_fields/Makefile
+++ b/tests/net/lib/http_header_fields/Makefile
@@ -1,17 +1,7 @@
 #
 # Copyright (c) 2016 Intel Corporation
 #
-# 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.
+# SPDX-License-Identifier: Apache-2.0
 #
 
 BOARD ?= qemu_x86
diff --git a/tests/net/lib/http_header_fields/src/Makefile b/tests/net/lib/http_header_fields/src/Makefile
index 7a974a6bc..af00f4782 100644
--- a/tests/net/lib/http_header_fields/src/Makefile
+++ b/tests/net/lib/http_header_fields/src/Makefile
@@ -1,17 +1,7 @@
 #
 # Copyright (c) 2016 Intel Corporation
 #
-# 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.
+# SPDX-License-Identifier: Apache-2.0
 #
 
 ccflags-y += -I$(ZEPHYR_BASE)/tests/include
diff --git a/tests/net/lib/mqtt_packet/src/mqtt_packet.c b/tests/net/lib/mqtt_packet/src/mqtt_packet.c
index befc3c99b..fc8e982d5 100644
--- a/tests/net/lib/mqtt_packet/src/mqtt_packet.c
+++ b/tests/net/lib/mqtt_packet/src/mqtt_packet.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <tc_util.h>
diff --git a/tests/net/lib/zoap/src/main.c b/tests/net/lib/zoap/src/main.c
index ad4469db7..cf4e1fa27 100644
--- a/tests/net/lib/zoap/src/main.c
+++ b/tests/net/lib/zoap/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <errno.h>
diff --git a/tests/net/mgmt/src/mgmt.c b/tests/net/mgmt/src/mgmt.c
index 9fb02027f..1982c41c9 100644
--- a/tests/net/mgmt/src/mgmt.c
+++ b/tests/net/mgmt/src/mgmt.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/net/nbuf/src/main.c b/tests/net/nbuf/src/main.c
index 1d9083756..f46a1579a 100644
--- a/tests/net/nbuf/src/main.c
+++ b/tests/net/nbuf/src/main.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <stdint.h>
diff --git a/tests/net/neighbor/src/main.c b/tests/net/neighbor/src/main.c
index 63ce7f14a..7f8a53f95 100644
--- a/tests/net/neighbor/src/main.c
+++ b/tests/net/neighbor/src/main.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <stdint.h>
diff --git a/tests/net/route/src/main.c b/tests/net/route/src/main.c
index 5f4ffd9f0..aefe2e18e 100644
--- a/tests/net/route/src/main.c
+++ b/tests/net/route/src/main.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <stdint.h>
diff --git a/tests/net/rpl/src/main.c b/tests/net/rpl/src/main.c
index d50e27b57..eb2dbc495 100644
--- a/tests/net/rpl/src/main.c
+++ b/tests/net/rpl/src/main.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <stdint.h>
diff --git a/tests/net/tcp/src/main.c b/tests/net/tcp/src/main.c
index 909901c6a..442e1efb7 100644
--- a/tests/net/tcp/src/main.c
+++ b/tests/net/tcp/src/main.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/net/trickle/src/main.c b/tests/net/trickle/src/main.c
index 38f936812..33adfbe64 100644
--- a/tests/net/trickle/src/main.c
+++ b/tests/net/trickle/src/main.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2015 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <stdint.h>
diff --git a/tests/net/udp/src/main.c b/tests/net/udp/src/main.c
index 177cd9246..2884de09a 100644
--- a/tests/net/udp/src/main.c
+++ b/tests/net/udp/src/main.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/net/utils/src/main.c b/tests/net/utils/src/main.c
index f2955b378..c83da89d0 100644
--- a/tests/net/utils/src/main.c
+++ b/tests/net/utils/src/main.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <stdint.h>
diff --git a/tests/power/power_states/src/main.c b/tests/power/power_states/src/main.c
index f5e561897..a7e6a803f 100644
--- a/tests/power/power_states/src/main.c
+++ b/tests/power/power_states/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/power/power_states/src/soc_watch_logger.c b/tests/power/power_states/src/soc_watch_logger.c
index a4d4e638f..abba1f94e 100644
--- a/tests/power/power_states/src/soc_watch_logger.c
+++ b/tests/power/power_states/src/soc_watch_logger.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include "soc_watch_logger.h"
diff --git a/tests/power/power_states/src/soc_watch_logger.h b/tests/power/power_states/src/soc_watch_logger.h
index 3eaeab833..12038d135 100644
--- a/tests/power/power_states/src/soc_watch_logger.h
+++ b/tests/power/power_states/src/soc_watch_logger.h
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/subsys/debug/gdb_server/src/main.c b/tests/subsys/debug/gdb_server/src/main.c
index 6a0b0938c..f7004ccac 100644
--- a/tests/subsys/debug/gdb_server/src/main.c
+++ b/tests/subsys/debug/gdb_server/src/main.c
@@ -3,17 +3,7 @@
 /*
  * Copyright (c) 2012-2014 Wind River Systems, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <zephyr.h>
diff --git a/tests/unit/net/buf/main.c b/tests/unit/net/buf/main.c
index 21ae8798e..88a30b2cb 100644
--- a/tests/unit/net/buf/main.c
+++ b/tests/unit/net/buf/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <ztest.h>
diff --git a/tests/ztest/Kconfig b/tests/ztest/Kconfig
index c8d453d4e..ea9cafe74 100644
--- a/tests/ztest/Kconfig
+++ b/tests/ztest/Kconfig
@@ -1,17 +1,7 @@
 #
 # Copyright (c) 2016 Intel Corporation
 #
-# 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.
+# SPDX-License-Identifier: Apache-2.0
 #
 
 config ZTEST
diff --git a/tests/ztest/include/ztest.h b/tests/ztest/include/ztest.h
index ff6bc3910..8f392dc1c 100644
--- a/tests/ztest/include/ztest.h
+++ b/tests/ztest/include/ztest.h
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/ztest/include/ztest_assert.h b/tests/ztest/include/ztest_assert.h
index 332d14293..54061830b 100644
--- a/tests/ztest/include/ztest_assert.h
+++ b/tests/ztest/include/ztest_assert.h
@@ -2,17 +2,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/ztest/include/ztest_mock.h b/tests/ztest/include/ztest_mock.h
index 77fce8683..04d819502 100644
--- a/tests/ztest/include/ztest_mock.h
+++ b/tests/ztest/include/ztest_mock.h
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/ztest/include/ztest_test.h b/tests/ztest/include/ztest_test.h
index 94d81d198..b9e4f976b 100644
--- a/tests/ztest/include/ztest_test.h
+++ b/tests/ztest/include/ztest_test.h
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**
diff --git a/tests/ztest/src/ztest.c b/tests/ztest/src/ztest.c
index 3f94e27ca..28b1bb47c 100644
--- a/tests/ztest/src/ztest.c
+++ b/tests/ztest/src/ztest.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <ztest.h>
diff --git a/tests/ztest/src/ztest_mock.c b/tests/ztest/src/ztest_mock.c
index 15ae492d6..26a9731d8 100644
--- a/tests/ztest/src/ztest_mock.c
+++ b/tests/ztest/src/ztest_mock.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <ztest.h>
diff --git a/tests/ztest/test/base/src/main.c b/tests/ztest/test/base/src/main.c
index 6f3ad4786..5be2bce7d 100644
--- a/tests/ztest/test/base/src/main.c
+++ b/tests/ztest/test/base/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <ztest.h>
diff --git a/tests/ztest/test/mock/src/main.c b/tests/ztest/test/mock/src/main.c
index e150ad60d..1ea1c0898 100644
--- a/tests/ztest/test/mock/src/main.c
+++ b/tests/ztest/test/mock/src/main.c
@@ -1,17 +1,7 @@
 /*
  * Copyright (c) 2016 Intel Corporation
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <ztest.h>