diff --git a/tests/kernel/fifo/test_fifo_api/src/main.c b/tests/kernel/fifo/test_fifo_api/src/main.c
index 65c99332cfe..1b7d493194d 100644
--- a/tests/kernel/fifo/test_fifo_api/src/main.c
+++ b/tests/kernel/fifo/test_fifo_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/fifo/test_fifo_api/src/test_fifo_contexts.c b/tests/kernel/fifo/test_fifo_api/src/test_fifo_contexts.c
index 70e0f0bafee..104cf05bb18 100644
--- a/tests/kernel/fifo/test_fifo_api/src/test_fifo_contexts.c
+++ b/tests/kernel/fifo/test_fifo_api/src/test_fifo_contexts.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/fifo/test_fifo_api/src/test_fifo_fail.c b/tests/kernel/fifo/test_fifo_api/src/test_fifo_fail.c
index a34149dec6b..e59889460c0 100644
--- a/tests/kernel/fifo/test_fifo_api/src/test_fifo_fail.c
+++ b/tests/kernel/fifo/test_fifo_api/src/test_fifo_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/fifo/test_fifo_api/src/test_fifo_loop.c b/tests/kernel/fifo/test_fifo_api/src/test_fifo_loop.c
index 246ba5683d8..41ae571aaa4 100644
--- a/tests/kernel/fifo/test_fifo_api/src/test_fifo_loop.c
+++ b/tests/kernel/fifo/test_fifo_api/src/test_fifo_loop.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/lifo/test_lifo_api/src/main.c b/tests/kernel/lifo/test_lifo_api/src/main.c
index 0bf8522e40e..727eaf60722 100644
--- a/tests/kernel/lifo/test_lifo_api/src/main.c
+++ b/tests/kernel/lifo/test_lifo_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/lifo/test_lifo_api/src/test_lifo_contexts.c b/tests/kernel/lifo/test_lifo_api/src/test_lifo_contexts.c
index f006e874923..8e04f605616 100644
--- a/tests/kernel/lifo/test_lifo_api/src/test_lifo_contexts.c
+++ b/tests/kernel/lifo/test_lifo_api/src/test_lifo_contexts.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/lifo/test_lifo_api/src/test_lifo_fail.c b/tests/kernel/lifo/test_lifo_api/src/test_lifo_fail.c
index ea4a433b82a..482e26beac9 100644
--- a/tests/kernel/lifo/test_lifo_api/src/test_lifo_fail.c
+++ b/tests/kernel/lifo/test_lifo_api/src/test_lifo_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/lifo/test_lifo_api/src/test_lifo_loop.c b/tests/kernel/lifo/test_lifo_api/src/test_lifo_loop.c
index e98864e2806..87af01f4f85 100644
--- a/tests/kernel/lifo/test_lifo_api/src/test_lifo_loop.c
+++ b/tests/kernel/lifo/test_lifo_api/src/test_lifo_loop.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_pool/test_mpool_api/src/main.c b/tests/kernel/mem_pool/test_mpool_api/src/main.c
index 30f009527c9..46ed380492f 100644
--- a/tests/kernel/mem_pool/test_mpool_api/src/main.c
+++ b/tests/kernel/mem_pool/test_mpool_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/mem_pool/test_mpool_api/src/test_mpool.h b/tests/kernel/mem_pool/test_mpool_api/src/test_mpool.h
index 6cba95d32db..cbd419389c1 100644
--- a/tests/kernel/mem_pool/test_mpool_api/src/test_mpool.h
+++ b/tests/kernel/mem_pool/test_mpool_api/src/test_mpool.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_MPOOL_H__
diff --git a/tests/kernel/mem_pool/test_mpool_api/src/test_mpool_api.c b/tests/kernel/mem_pool/test_mpool_api/src/test_mpool_api.c
index 55bf9039458..75e30583a53 100644
--- a/tests/kernel/mem_pool/test_mpool_api/src/test_mpool_api.c
+++ b/tests/kernel/mem_pool/test_mpool_api/src/test_mpool_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
  */
 
 /**
diff --git a/tests/kernel/mem_pool/test_mpool_api/src/test_mpool_extern.c b/tests/kernel/mem_pool/test_mpool_api/src/test_mpool_extern.c
index 0b4033c0eea..901629732cf 100644
--- a/tests/kernel/mem_pool/test_mpool_api/src/test_mpool_extern.c
+++ b/tests/kernel/mem_pool/test_mpool_api/src/test_mpool_extern.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/mem_pool/test_mpool_concept/src/main.c b/tests/kernel/mem_pool/test_mpool_concept/src/main.c
index 42a0cea77d8..f60de183be5 100644
--- a/tests/kernel/mem_pool/test_mpool_concept/src/main.c
+++ b/tests/kernel/mem_pool/test_mpool_concept/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/mem_pool/test_mpool_concept/src/test_mpool.h b/tests/kernel/mem_pool/test_mpool_concept/src/test_mpool.h
index 596852bb68c..d3c5470152b 100644
--- a/tests/kernel/mem_pool/test_mpool_concept/src/test_mpool.h
+++ b/tests/kernel/mem_pool/test_mpool_concept/src/test_mpool.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
  */
 
 #define TIMEOUT 2000
diff --git a/tests/kernel/mem_pool/test_mpool_concept/src/test_mpool_alloc_size.c b/tests/kernel/mem_pool/test_mpool_concept/src/test_mpool_alloc_size.c
index 45b7a55b2e0..d51398650f4 100644
--- a/tests/kernel/mem_pool/test_mpool_concept/src/test_mpool_alloc_size.c
+++ b/tests/kernel/mem_pool/test_mpool_concept/src/test_mpool_alloc_size.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/mem_pool/test_mpool_concept/src/test_mpool_alloc_wait.c b/tests/kernel/mem_pool/test_mpool_concept/src/test_mpool_alloc_wait.c
index a6c86186456..f07f3e6944e 100644
--- a/tests/kernel/mem_pool/test_mpool_concept/src/test_mpool_alloc_wait.c
+++ b/tests/kernel/mem_pool/test_mpool_concept/src/test_mpool_alloc_wait.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/mem_pool/test_mpool_concept/src/test_mpool_merge_fail_diff_parent.c b/tests/kernel/mem_pool/test_mpool_concept/src/test_mpool_merge_fail_diff_parent.c
index 2452deee66e..1453775e0c3 100644
--- a/tests/kernel/mem_pool/test_mpool_concept/src/test_mpool_merge_fail_diff_parent.c
+++ b/tests/kernel/mem_pool/test_mpool_concept/src/test_mpool_merge_fail_diff_parent.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/mem_pool/test_mpool_concept/src/test_mpool_merge_fail_diff_size.c b/tests/kernel/mem_pool/test_mpool_concept/src/test_mpool_merge_fail_diff_size.c
index dffa2b96fc8..452a62da188 100644
--- a/tests/kernel/mem_pool/test_mpool_concept/src/test_mpool_merge_fail_diff_size.c
+++ b/tests/kernel/mem_pool/test_mpool_concept/src/test_mpool_merge_fail_diff_size.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/mem_pool/test_mpool_options/src/main.c b/tests/kernel/mem_pool/test_mpool_options/src/main.c
index 675595a1808..5abdfc299d2 100644
--- a/tests/kernel/mem_pool/test_mpool_options/src/main.c
+++ b/tests/kernel/mem_pool/test_mpool_options/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/mem_pool/test_mpool_options/src/test_mpool_options.c b/tests/kernel/mem_pool/test_mpool_options/src/test_mpool_options.c
index 37fde817fe9..2e355dabd74 100644
--- a/tests/kernel/mem_pool/test_mpool_options/src/test_mpool_options.c
+++ b/tests/kernel/mem_pool/test_mpool_options/src/test_mpool_options.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/mem_pool/test_mpool_threadsafe/src/main.c b/tests/kernel/mem_pool/test_mpool_threadsafe/src/main.c
index 3763edced77..8fc7d2c5ae5 100644
--- a/tests/kernel/mem_pool/test_mpool_threadsafe/src/main.c
+++ b/tests/kernel/mem_pool/test_mpool_threadsafe/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/mem_pool/test_mpool_threadsafe/src/test_mpool_threadsafe.c b/tests/kernel/mem_pool/test_mpool_threadsafe/src/test_mpool_threadsafe.c
index 397ca1abc4d..bb8583675cc 100644
--- a/tests/kernel/mem_pool/test_mpool_threadsafe/src/test_mpool_threadsafe.c
+++ b/tests/kernel/mem_pool/test_mpool_threadsafe/src/test_mpool_threadsafe.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/mem_slab/test_mslab_api/src/main.c b/tests/kernel/mem_slab/test_mslab_api/src/main.c
index 08b2a54f0d3..acca6cd8b9c 100644
--- a/tests/kernel/mem_slab/test_mslab_api/src/main.c
+++ b/tests/kernel/mem_slab/test_mslab_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/mem_slab/test_mslab_api/src/test_mslab.h b/tests/kernel/mem_slab/test_mslab_api/src/test_mslab.h
index 527bee8aa9b..45f21d95742 100644
--- a/tests/kernel/mem_slab/test_mslab_api/src/test_mslab.h
+++ b/tests/kernel/mem_slab/test_mslab_api/src/test_mslab.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_MSLAB_H__
diff --git a/tests/kernel/mem_slab/test_mslab_api/src/test_mslab_api.c b/tests/kernel/mem_slab/test_mslab_api/src/test_mslab_api.c
index 6a9f1bd9958..0ee786c696d 100644
--- a/tests/kernel/mem_slab/test_mslab_api/src/test_mslab_api.c
+++ b/tests/kernel/mem_slab/test_mslab_api/src/test_mslab_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
  */
 
 /**
diff --git a/tests/kernel/mem_slab/test_mslab_api/src/test_mslab_extern.c b/tests/kernel/mem_slab/test_mslab_api/src/test_mslab_extern.c
index 945ca26338d..3464bc21a2b 100644
--- a/tests/kernel/mem_slab/test_mslab_api/src/test_mslab_extern.c
+++ b/tests/kernel/mem_slab/test_mslab_api/src/test_mslab_extern.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/mem_slab/test_mslab_concept/src/main.c b/tests/kernel/mem_slab/test_mslab_concept/src/main.c
index 8fbe18dee1c..90697ff8d5b 100644
--- a/tests/kernel/mem_slab/test_mslab_concept/src/main.c
+++ b/tests/kernel/mem_slab/test_mslab_concept/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/mem_slab/test_mslab_concept/src/test_mslab.h b/tests/kernel/mem_slab/test_mslab_concept/src/test_mslab.h
index 9710e4a3879..c404b12d2d3 100644
--- a/tests/kernel/mem_slab/test_mslab_concept/src/test_mslab.h
+++ b/tests/kernel/mem_slab/test_mslab_concept/src/test_mslab.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_MSLAB_H__
diff --git a/tests/kernel/mem_slab/test_mslab_concept/src/test_mslab_alloc_wait.c b/tests/kernel/mem_slab/test_mslab_concept/src/test_mslab_alloc_wait.c
index dd228450a31..42dc189fee0 100644
--- a/tests/kernel/mem_slab/test_mslab_concept/src/test_mslab_alloc_wait.c
+++ b/tests/kernel/mem_slab/test_mslab_concept/src/test_mslab_alloc_wait.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/mem_slab/test_mslab_threadsafe/src/main.c b/tests/kernel/mem_slab/test_mslab_threadsafe/src/main.c
index 66212319b95..70d1ca78f58 100644
--- a/tests/kernel/mem_slab/test_mslab_threadsafe/src/main.c
+++ b/tests/kernel/mem_slab/test_mslab_threadsafe/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/mem_slab/test_mslab_threadsafe/src/test_mslab_threadsafe.c b/tests/kernel/mem_slab/test_mslab_threadsafe/src/test_mslab_threadsafe.c
index 3e9703cacd5..64e347e764a 100644
--- a/tests/kernel/mem_slab/test_mslab_threadsafe/src/test_mslab_threadsafe.c
+++ b/tests/kernel/mem_slab/test_mslab_threadsafe/src/test_mslab_threadsafe.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/pipe/test_pipe_api/src/main.c b/tests/kernel/pipe/test_pipe_api/src/main.c
index 926e3ec0fd5..bf09791fc32 100644
--- a/tests/kernel/pipe/test_pipe_api/src/main.c
+++ b/tests/kernel/pipe/test_pipe_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/pipe/test_pipe_api/src/test_pipe_contexts.c b/tests/kernel/pipe/test_pipe_api/src/test_pipe_contexts.c
index 1995741c9d7..b9313b2313e 100644
--- a/tests/kernel/pipe/test_pipe_api/src/test_pipe_contexts.c
+++ b/tests/kernel/pipe/test_pipe_api/src/test_pipe_contexts.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/pipe/test_pipe_api/src/test_pipe_fail.c b/tests/kernel/pipe/test_pipe_api/src/test_pipe_fail.c
index a591953a24b..06ee1dca540 100644
--- a/tests/kernel/pipe/test_pipe_api/src/test_pipe_fail.c
+++ b/tests/kernel/pipe/test_pipe_api/src/test_pipe_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/threads_customdata/cdata_api/src/main.c b/tests/kernel/threads_customdata/cdata_api/src/main.c
index ea356277c4d..4e30dd45a78 100644
--- a/tests/kernel/threads_customdata/cdata_api/src/main.c
+++ b/tests/kernel/threads_customdata/cdata_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/threads_customdata/cdata_api/src/test_cdata.h b/tests/kernel/threads_customdata/cdata_api/src/test_cdata.h
index 54cfa77f13c..c375b75cf4f 100644
--- a/tests/kernel/threads_customdata/cdata_api/src/test_cdata.h
+++ b/tests/kernel/threads_customdata/cdata_api/src/test_cdata.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_CUSTOMDATA_H__
diff --git a/tests/kernel/threads_customdata/cdata_api/src/test_customdata_api.c b/tests/kernel/threads_customdata/cdata_api/src/test_customdata_api.c
index 1176da16a40..01b30673a00 100644
--- a/tests/kernel/threads_customdata/cdata_api/src/test_customdata_api.c
+++ b/tests/kernel/threads_customdata/cdata_api/src/test_customdata_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 <ztest.h>