diff --git a/tests/binary/test_binary.py b/tests/binary/test_binary.py
index c51e2090..72204767 100644
--- a/tests/binary/test_binary.py
+++ b/tests/binary/test_binary.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
 
+# Copyright (c) 2023 Contributors to COVESA
 #
-# (C) 2023 Robert Bosch GmbH
-#
-# All files and artifacts in this repository are licensed under the
-# provisions of the license provided by the LICENSE file in this repository.
+# This program and the accompanying materials are made available under the
+# terms of the Mozilla Public License 2.0 which is available at
+# https://www.mozilla.org/en-US/MPL/2.0/
 #
+# SPDX-License-Identifier: MPL-2.0
 
 import pytest
 import os
diff --git a/tests/instances/test_instances.py b/tests/instances/test_instances.py
index ad6544cd..a6acef14 100644
--- a/tests/instances/test_instances.py
+++ b/tests/instances/test_instances.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
 
+# Copyright (c) 2022 Contributors to COVESA
 #
-# Copyright (C) 2022, Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#
-# All files and artifacts in this repository are licensed under the
-# provisions of the license provided by the LICENSE file in this repository.
+# This program and the accompanying materials are made available under the
+# terms of the Mozilla Public License 2.0 which is available at
+# https://www.mozilla.org/en-US/MPL/2.0/
 #
+# SPDX-License-Identifier: MPL-2.0
 
 from typing import Dict
 from vspec.model.vsstree import VSSNode
diff --git a/tests/model/test_contants.py b/tests/model/test_contants.py
index 8ac00640..cc7dd4d3 100644
--- a/tests/model/test_contants.py
+++ b/tests/model/test_contants.py
@@ -1,3 +1,11 @@
+# Copyright (c) 2020 Contributors to COVESA
+#
+# This program and the accompanying materials are made available under the
+# terms of the Mozilla Public License 2.0 which is available at
+# https://www.mozilla.org/en-US/MPL/2.0/
+#
+# SPDX-License-Identifier: MPL-2.0
+
 import pytest
 import os
 
diff --git a/tests/model/test_vsstree.py b/tests/model/test_vsstree.py
index 081a55fb..c254413b 100644
--- a/tests/model/test_vsstree.py
+++ b/tests/model/test_vsstree.py
@@ -1,3 +1,11 @@
+# Copyright (c) 2020 Contributors to COVESA
+#
+# This program and the accompanying materials are made available under the
+# terms of the Mozilla Public License 2.0 which is available at
+# https://www.mozilla.org/en-US/MPL/2.0/
+#
+# SPDX-License-Identifier: MPL-2.0
+
 import unittest
 import os
 
diff --git a/tests/model/test_vsstree_default.py b/tests/model/test_vsstree_default.py
index 6c88c67c..d7ce6319 100644
--- a/tests/model/test_vsstree_default.py
+++ b/tests/model/test_vsstree_default.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
 
+# Copyright (c) 2023 Contributors to COVESA
 #
-# (C) 2023 Robert Bosch GmbH
-#
-# All files and artifacts in this repository are licensed under the
-# provisions of the license provided by the LICENSE file in this repository.
+# This program and the accompanying materials are made available under the
+# terms of the Mozilla Public License 2.0 which is available at
+# https://www.mozilla.org/en-US/MPL/2.0/
 #
+# SPDX-License-Identifier: MPL-2.0
 
 import pytest
 
diff --git a/tests/vspec/test_allowed/test_allowed.py b/tests/vspec/test_allowed/test_allowed.py
index e658d4fe..a19e13ac 100644
--- a/tests/vspec/test_allowed/test_allowed.py
+++ b/tests/vspec/test_allowed/test_allowed.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
 
+# Copyright (c) 2023 Contributors to COVESA
 #
-# (C) 2023 Robert Bosch GmbH
-#
-# All files and artifacts in this repository are licensed under the
-# provisions of the license provided by the LICENSE file in this repository.
+# This program and the accompanying materials are made available under the
+# terms of the Mozilla Public License 2.0 which is available at
+# https://www.mozilla.org/en-US/MPL/2.0/
 #
+# SPDX-License-Identifier: MPL-2.0
 
 import pytest
 import os
diff --git a/tests/vspec/test_datatypes_error/test_datatypes_error.py b/tests/vspec/test_datatypes_error/test_datatypes_error.py
index c86dba2e..97116f86 100644
--- a/tests/vspec/test_datatypes_error/test_datatypes_error.py
+++ b/tests/vspec/test_datatypes_error/test_datatypes_error.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
 
+# Copyright (c) 2023 Contributors to COVESA
 #
-# (C) 2023 Robert Bosch GmbH
-#
-# All files and artifacts in this repository are licensed under the
-# provisions of the license provided by the LICENSE file in this repository.
+# This program and the accompanying materials are made available under the
+# terms of the Mozilla Public License 2.0 which is available at
+# https://www.mozilla.org/en-US/MPL/2.0/
 #
+# SPDX-License-Identifier: MPL-2.0
 
 import pytest
 import os
diff --git a/tests/vspec/test_default_unit/test_default_units.py b/tests/vspec/test_default_unit/test_default_units.py
index 3144ec47..bd89ec36 100644
--- a/tests/vspec/test_default_unit/test_default_units.py
+++ b/tests/vspec/test_default_unit/test_default_units.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
 
+# Copyright (c) 2023 Contributors to COVESA
 #
-# (C) 2023 Robert Bosch GmbH
-#
-# All files and artifacts in this repository are licensed under the
-# provisions of the license provided by the LICENSE file in this repository.
+# This program and the accompanying materials are made available under the
+# terms of the Mozilla Public License 2.0 which is available at
+# https://www.mozilla.org/en-US/MPL/2.0/
 #
+# SPDX-License-Identifier: MPL-2.0
 
 import pytest
 import os
diff --git a/tests/vspec/test_description_error/test_description_error.py b/tests/vspec/test_description_error/test_description_error.py
index bf985e99..653752b7 100644
--- a/tests/vspec/test_description_error/test_description_error.py
+++ b/tests/vspec/test_description_error/test_description_error.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
 
+# Copyright (c) 2023 Contributors to COVESA
 #
-# (C) 2023 Robert Bosch GmbH
-#
-# All files and artifacts in this repository are licensed under the
-# provisions of the license provided by the LICENSE file in this repository.
+# This program and the accompanying materials are made available under the
+# terms of the Mozilla Public License 2.0 which is available at
+# https://www.mozilla.org/en-US/MPL/2.0/
 #
+# SPDX-License-Identifier: MPL-2.0
 
 import pytest
 import os
diff --git a/tests/vspec/test_faulty_type/test_faulty_type.py b/tests/vspec/test_faulty_type/test_faulty_type.py
index 6fb1e729..0f708e9e 100644
--- a/tests/vspec/test_faulty_type/test_faulty_type.py
+++ b/tests/vspec/test_faulty_type/test_faulty_type.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
 
+# Copyright (c) 2022 Contributors to COVESA
 #
-# (C) 2022 Robert Bosch GmbH
-#
-# All files and artifacts in this repository are licensed under the
-# provisions of the license provided by the LICENSE file in this repository.
+# This program and the accompanying materials are made available under the
+# terms of the Mozilla Public License 2.0 which is available at
+# https://www.mozilla.org/en-US/MPL/2.0/
 #
+# SPDX-License-Identifier: MPL-2.0
 
 import pytest
 import os
diff --git a/tests/vspec/test_generic.py b/tests/vspec/test_generic.py
index 9ecbffc9..ef189568 100644
--- a/tests/vspec/test_generic.py
+++ b/tests/vspec/test_generic.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
 
+# Copyright (c) 2022 Contributors to COVESA
 #
-# (C) 2022 Robert Bosch GmbH
-#
-# All files and artifacts in this repository are licensed under the
-# provisions of the license provided by the LICENSE file in this repository.
+# This program and the accompanying materials are made available under the
+# terms of the Mozilla Public License 2.0 which is available at
+# https://www.mozilla.org/en-US/MPL/2.0/
 #
+# SPDX-License-Identifier: MPL-2.0
 
 import pathlib
 import pytest
diff --git a/tests/vspec/test_include/test_include.py b/tests/vspec/test_include/test_include.py
index 6dc3d73e..d173987e 100644
--- a/tests/vspec/test_include/test_include.py
+++ b/tests/vspec/test_include/test_include.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
 
+# Copyright (c) 2022 Contributors to COVESA
 #
-# (C) 2022 Robert Bosch GmbH
-#
-# All files and artifacts in this repository are licensed under the
-# provisions of the license provided by the LICENSE file in this repository.
+# This program and the accompanying materials are made available under the
+# terms of the Mozilla Public License 2.0 which is available at
+# https://www.mozilla.org/en-US/MPL/2.0/
 #
+# SPDX-License-Identifier: MPL-2.0
 
 import pytest
 import os
diff --git a/tests/vspec/test_multiple_type_trees/test_multiple_type_trees.py b/tests/vspec/test_multiple_type_trees/test_multiple_type_trees.py
index 7d83ffa2..b16a7f4f 100644
--- a/tests/vspec/test_multiple_type_trees/test_multiple_type_trees.py
+++ b/tests/vspec/test_multiple_type_trees/test_multiple_type_trees.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
 
+# Copyright (c) 2023 Contributors to COVESA
 #
-# (C) 2023 Robert Bosch GmbH
-#
-# All files and artifacts in this repository are licensed under the
-# provisions of the license provided by the LICENSE file in this repository.
+# This program and the accompanying materials are made available under the
+# terms of the Mozilla Public License 2.0 which is available at
+# https://www.mozilla.org/en-US/MPL/2.0/
 #
+# SPDX-License-Identifier: MPL-2.0
 
 import pytest
 import os
diff --git a/tests/vspec/test_no_expand/test_no_expand.py b/tests/vspec/test_no_expand/test_no_expand.py
index f80a05c1..e7908767 100644
--- a/tests/vspec/test_no_expand/test_no_expand.py
+++ b/tests/vspec/test_no_expand/test_no_expand.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
 
+# Copyright (c) 2023 Contributors to COVESA
 #
-# (C) 2023 Robert Bosch GmbH
-#
-# All files and artifacts in this repository are licensed under the
-# provisions of the license provided by the LICENSE file in this repository.
+# This program and the accompanying materials are made available under the
+# terms of the Mozilla Public License 2.0 which is available at
+# https://www.mozilla.org/en-US/MPL/2.0/
 #
+# SPDX-License-Identifier: MPL-2.0
 
 import pytest
 import os
diff --git a/tests/vspec/test_overlay/test_overlay.py b/tests/vspec/test_overlay/test_overlay.py
index 13d2f2b5..821aaf1e 100644
--- a/tests/vspec/test_overlay/test_overlay.py
+++ b/tests/vspec/test_overlay/test_overlay.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
 
+# Copyright (c) 2022 Contributors to COVESA
 #
-# (C) 2022 Robert Bosch GmbH
-#
-# All files and artifacts in this repository are licensed under the
-# provisions of the license provided by the LICENSE file in this repository.
+# This program and the accompanying materials are made available under the
+# terms of the Mozilla Public License 2.0 which is available at
+# https://www.mozilla.org/en-US/MPL/2.0/
 #
+# SPDX-License-Identifier: MPL-2.0
 
 import pytest
 import os
diff --git a/tests/vspec/test_overlay_on_instance/test_overlay_on_instance.py b/tests/vspec/test_overlay_on_instance/test_overlay_on_instance.py
index ed4887a2..b8fe9c0c 100644
--- a/tests/vspec/test_overlay_on_instance/test_overlay_on_instance.py
+++ b/tests/vspec/test_overlay_on_instance/test_overlay_on_instance.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
 
+# Copyright (c) 2023 Contributors to COVESA
 #
-# (C) 2023 Robert Bosch GmbH
-#
-# All files and artifacts in this repository are licensed under the
-# provisions of the license provided by the LICENSE file in this repository.
+# This program and the accompanying materials are made available under the
+# terms of the Mozilla Public License 2.0 which is available at
+# https://www.mozilla.org/en-US/MPL/2.0/
 #
+# SPDX-License-Identifier: MPL-2.0
 
 import pytest
 import os
diff --git a/tests/vspec/test_overlay_struct/test_overlay_struct.py b/tests/vspec/test_overlay_struct/test_overlay_struct.py
index 23e0d764..237b72ce 100644
--- a/tests/vspec/test_overlay_struct/test_overlay_struct.py
+++ b/tests/vspec/test_overlay_struct/test_overlay_struct.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
 
+# Copyright (c) 2022 Contributors to COVESA
 #
-# (C) 2022 Robert Bosch GmbH
-#
-# All files and artifacts in this repository are licensed under the
-# provisions of the license provided by the LICENSE file in this repository.
+# This program and the accompanying materials are made available under the
+# terms of the Mozilla Public License 2.0 which is available at
+# https://www.mozilla.org/en-US/MPL/2.0/
 #
+# SPDX-License-Identifier: MPL-2.0
 
 import pytest
 import os
diff --git a/tests/vspec/test_overlay_struct_array/test_overlay_struct_array.py b/tests/vspec/test_overlay_struct_array/test_overlay_struct_array.py
index 273f7d47..4f83b3d0 100644
--- a/tests/vspec/test_overlay_struct_array/test_overlay_struct_array.py
+++ b/tests/vspec/test_overlay_struct_array/test_overlay_struct_array.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
 
+# Copyright (c) 2023 Contributors to COVESA
 #
-# (C) 2023 Robert Bosch GmbH
-#
-# All files and artifacts in this repository are licensed under the
-# provisions of the license provided by the LICENSE file in this repository.
+# This program and the accompanying materials are made available under the
+# terms of the Mozilla Public License 2.0 which is available at
+# https://www.mozilla.org/en-US/MPL/2.0/
 #
+# SPDX-License-Identifier: MPL-2.0
 
 import pytest
 import os
diff --git a/tests/vspec/test_struct_as_root/test_struct_as_root.py b/tests/vspec/test_struct_as_root/test_struct_as_root.py
index c0424893..4d7dc329 100644
--- a/tests/vspec/test_struct_as_root/test_struct_as_root.py
+++ b/tests/vspec/test_struct_as_root/test_struct_as_root.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
 
+# Copyright (c) 2023 Contributors to COVESA
 #
-# (C) 2023 Robert Bosch GmbH
-#
-# All files and artifacts in this repository are licensed under the
-# provisions of the license provided by the LICENSE file in this repository.
+# This program and the accompanying materials are made available under the
+# terms of the Mozilla Public License 2.0 which is available at
+# https://www.mozilla.org/en-US/MPL/2.0/
 #
+# SPDX-License-Identifier: MPL-2.0
 
 import pytest
 import os
diff --git a/tests/vspec/test_structs/test_commandline.py b/tests/vspec/test_structs/test_commandline.py
index 7d7ffc81..797f3b31 100644
--- a/tests/vspec/test_structs/test_commandline.py
+++ b/tests/vspec/test_structs/test_commandline.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
 
+# Copyright (c) 2022 Contributors to COVESA
 #
-# (C) 2022 Robert Bosch GmbH
-#
-# All files and artifacts in this repository are licensed under the
-# provisions of the license provided by the LICENSE file in this repository.
+# This program and the accompanying materials are made available under the
+# terms of the Mozilla Public License 2.0 which is available at
+# https://www.mozilla.org/en-US/MPL/2.0/
 #
+# SPDX-License-Identifier: MPL-2.0
 
 import pytest
 import os
@@ -47,7 +48,7 @@ def test_error_with_non_compatible_formats(format, change_test_dir):
 
     # test that the expected error is outputted
     test_str = f'grep \"error: {format} format is not yet supported in vspec struct/data type support feature\" ' + \
-               'out.txt > /dev/null'
+        'out.txt > /dev/null'
     result = os.system(test_str)
     os.system("cat out.txt")
     os.system("rm -f out.json out.txt output_types_file.json output_file.json")
diff --git a/tests/vspec/test_structs/test_data_type_parsing.py b/tests/vspec/test_structs/test_data_type_parsing.py
index 57ecfd2b..219eff96 100644
--- a/tests/vspec/test_structs/test_data_type_parsing.py
+++ b/tests/vspec/test_structs/test_data_type_parsing.py
@@ -1,8 +1,12 @@
 #!/usr/bin/env python3
 
-# All files and artifacts in this repository are licensed under the
-# provisions of the license provided by the LICENSE file in this repository.
+# Copyright (c) 2023 Contributors to COVESA
 #
+# This program and the accompanying materials are made available under the
+# terms of the Mozilla Public License 2.0 which is available at
+# https://www.mozilla.org/en-US/MPL/2.0/
+#
+# SPDX-License-Identifier: MPL-2.0
 
 import pytest
 import os
diff --git a/tests/vspec/test_type_error/test_type_error.py b/tests/vspec/test_type_error/test_type_error.py
index 7d7bbc1a..47012151 100644
--- a/tests/vspec/test_type_error/test_type_error.py
+++ b/tests/vspec/test_type_error/test_type_error.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
 
+# Copyright (c) 2023 Contributors to COVESA
 #
-# (C) 2023 Robert Bosch GmbH
-#
-# All files and artifacts in this repository are licensed under the
-# provisions of the license provided by the LICENSE file in this repository.
+# This program and the accompanying materials are made available under the
+# terms of the Mozilla Public License 2.0 which is available at
+# https://www.mozilla.org/en-US/MPL/2.0/
 #
+# SPDX-License-Identifier: MPL-2.0
 
 import pytest
 import os
diff --git a/tests/vspec/test_types_with_uuid/test_uuid.py b/tests/vspec/test_types_with_uuid/test_uuid.py
index 1d0dede3..6bdb6f88 100644
--- a/tests/vspec/test_types_with_uuid/test_uuid.py
+++ b/tests/vspec/test_types_with_uuid/test_uuid.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
 
+# Copyright (c) 2022 Contributors to COVESA
 #
-# (C) 2022 Robert Bosch GmbH
-#
-# All files and artifacts in this repository are licensed under the
-# provisions of the license provided by the LICENSE file in this repository.
+# This program and the accompanying materials are made available under the
+# terms of the Mozilla Public License 2.0 which is available at
+# https://www.mozilla.org/en-US/MPL/2.0/
 #
+# SPDX-License-Identifier: MPL-2.0
 
 import pytest
 import os
diff --git a/tests/vspec/test_units/test_units.py b/tests/vspec/test_units/test_units.py
index 05886e62..70da2af9 100644
--- a/tests/vspec/test_units/test_units.py
+++ b/tests/vspec/test_units/test_units.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
 
+# Copyright (c) 2022 Contributors to COVESA
 #
-# (C) 2022 Robert Bosch GmbH
-#
-# All files and artifacts in this repository are licensed under the
-# provisions of the license provided by the LICENSE file in this repository.
+# This program and the accompanying materials are made available under the
+# terms of the Mozilla Public License 2.0 which is available at
+# https://www.mozilla.org/en-US/MPL/2.0/
 #
+# SPDX-License-Identifier: MPL-2.0
 
 import pytest
 import os