diff --git a/src/spdx/casing_tools.py b/src/spdx/casing_tools.py
index fdbc07f15..d77ba9222 100644
--- a/src/spdx/casing_tools.py
+++ b/src/spdx/casing_tools.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from re import sub
 
 
diff --git a/src/spdx/clitools/pyspdxtools.py b/src/spdx/clitools/pyspdxtools.py
index dece3733f..e5ee38166 100644
--- a/src/spdx/clitools/pyspdxtools.py
+++ b/src/spdx/clitools/pyspdxtools.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
 
 # Copyright (c) 2020 Yash Varshney
+# Copyright (c) 2023 spdx contributors
+# 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
diff --git a/src/spdx/datetime_conversions.py b/src/spdx/datetime_conversions.py
index e0a1383bc..e74e09474 100644
--- a/src/spdx/datetime_conversions.py
+++ b/src/spdx/datetime_conversions.py
@@ -1,13 +1,6 @@
-#  Copyright (c) 2022 spdx contributors
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from datetime import datetime
 
 
diff --git a/src/spdx/document_utils.py b/src/spdx/document_utils.py
index b212cc77b..d3bf3ddcc 100644
--- a/src/spdx/document_utils.py
+++ b/src/spdx/document_utils.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import List, Union
 
 from spdx.model.document import Document
diff --git a/src/spdx/formats.py b/src/spdx/formats.py
index 2b6b2d64c..eefd51369 100644
--- a/src/spdx/formats.py
+++ b/src/spdx/formats.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from enum import Enum, auto
 
 from spdx.parser.error import SPDXParsingError
diff --git a/src/spdx/jsonschema/annotation_converter.py b/src/spdx/jsonschema/annotation_converter.py
index b06c932da..7688d81cb 100644
--- a/src/spdx/jsonschema/annotation_converter.py
+++ b/src/spdx/jsonschema/annotation_converter.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import Any, Type
 
 from spdx.datetime_conversions import datetime_to_iso_string
diff --git a/src/spdx/jsonschema/annotation_properties.py b/src/spdx/jsonschema/annotation_properties.py
index ffed44494..688eb9530 100644
--- a/src/spdx/jsonschema/annotation_properties.py
+++ b/src/spdx/jsonschema/annotation_properties.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from enum import auto
 
 from spdx.jsonschema.json_property import JsonProperty
diff --git a/src/spdx/jsonschema/checksum_converter.py b/src/spdx/jsonschema/checksum_converter.py
index edc466311..cd430c274 100644
--- a/src/spdx/jsonschema/checksum_converter.py
+++ b/src/spdx/jsonschema/checksum_converter.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import Type
 
 from spdx.jsonschema.checksum_properties import ChecksumProperty
diff --git a/src/spdx/jsonschema/checksum_properties.py b/src/spdx/jsonschema/checksum_properties.py
index d0733fa65..9ab691bee 100644
--- a/src/spdx/jsonschema/checksum_properties.py
+++ b/src/spdx/jsonschema/checksum_properties.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from enum import auto
 
 from spdx.jsonschema.json_property import JsonProperty
diff --git a/src/spdx/jsonschema/converter.py b/src/spdx/jsonschema/converter.py
index 45444dc03..484777898 100644
--- a/src/spdx/jsonschema/converter.py
+++ b/src/spdx/jsonschema/converter.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from abc import ABC, abstractmethod
 from typing import Any, Dict, Generic, Type, TypeVar
 
diff --git a/src/spdx/jsonschema/creation_info_converter.py b/src/spdx/jsonschema/creation_info_converter.py
index 96ded13a0..70e0b3e29 100644
--- a/src/spdx/jsonschema/creation_info_converter.py
+++ b/src/spdx/jsonschema/creation_info_converter.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import Any, Type
 
 from spdx.datetime_conversions import datetime_to_iso_string
diff --git a/src/spdx/jsonschema/creation_info_properties.py b/src/spdx/jsonschema/creation_info_properties.py
index 35acc20ba..79aa266ae 100644
--- a/src/spdx/jsonschema/creation_info_properties.py
+++ b/src/spdx/jsonschema/creation_info_properties.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from enum import auto
 
 from spdx.jsonschema.json_property import JsonProperty
diff --git a/src/spdx/jsonschema/document_converter.py b/src/spdx/jsonschema/document_converter.py
index 598dceb2d..3a1675745 100644
--- a/src/spdx/jsonschema/document_converter.py
+++ b/src/spdx/jsonschema/document_converter.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import Any, Type
 
 from spdx.document_utils import get_contained_spdx_element_ids
diff --git a/src/spdx/jsonschema/document_properties.py b/src/spdx/jsonschema/document_properties.py
index 7acd02520..a1413d004 100644
--- a/src/spdx/jsonschema/document_properties.py
+++ b/src/spdx/jsonschema/document_properties.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from enum import auto
 
 from spdx.jsonschema.json_property import JsonProperty
diff --git a/src/spdx/jsonschema/external_document_ref_converter.py b/src/spdx/jsonschema/external_document_ref_converter.py
index 03dccf795..196fac7de 100644
--- a/src/spdx/jsonschema/external_document_ref_converter.py
+++ b/src/spdx/jsonschema/external_document_ref_converter.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import Any, Type
 
 from spdx.jsonschema.checksum_converter import ChecksumConverter
diff --git a/src/spdx/jsonschema/external_document_ref_properties.py b/src/spdx/jsonschema/external_document_ref_properties.py
index d014e4e77..d80990c2d 100644
--- a/src/spdx/jsonschema/external_document_ref_properties.py
+++ b/src/spdx/jsonschema/external_document_ref_properties.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from enum import auto
 
 from spdx.jsonschema.json_property import JsonProperty
diff --git a/src/spdx/jsonschema/external_package_ref_converter.py b/src/spdx/jsonschema/external_package_ref_converter.py
index 5dbbb1e45..91e1104c3 100644
--- a/src/spdx/jsonschema/external_package_ref_converter.py
+++ b/src/spdx/jsonschema/external_package_ref_converter.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import Any, Type
 
 from spdx.jsonschema.converter import TypedConverter
diff --git a/src/spdx/jsonschema/external_package_ref_properties.py b/src/spdx/jsonschema/external_package_ref_properties.py
index 9c90f3317..f922e95d5 100644
--- a/src/spdx/jsonschema/external_package_ref_properties.py
+++ b/src/spdx/jsonschema/external_package_ref_properties.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from enum import auto
 
 from spdx.jsonschema.json_property import JsonProperty
diff --git a/src/spdx/jsonschema/extracted_licensing_info_converter.py b/src/spdx/jsonschema/extracted_licensing_info_converter.py
index 9d7ea23c5..0af7469df 100644
--- a/src/spdx/jsonschema/extracted_licensing_info_converter.py
+++ b/src/spdx/jsonschema/extracted_licensing_info_converter.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import Any, Type
 
 from spdx.jsonschema.converter import TypedConverter
diff --git a/src/spdx/jsonschema/extracted_licensing_info_properties.py b/src/spdx/jsonschema/extracted_licensing_info_properties.py
index f1b793fbe..46b6b6290 100644
--- a/src/spdx/jsonschema/extracted_licensing_info_properties.py
+++ b/src/spdx/jsonschema/extracted_licensing_info_properties.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from enum import auto
 
 from spdx.jsonschema.json_property import JsonProperty
diff --git a/src/spdx/jsonschema/file_converter.py b/src/spdx/jsonschema/file_converter.py
index 3b22a6108..518de6719 100644
--- a/src/spdx/jsonschema/file_converter.py
+++ b/src/spdx/jsonschema/file_converter.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import Any, Type
 
 from spdx.jsonschema.annotation_converter import AnnotationConverter
diff --git a/src/spdx/jsonschema/file_properties.py b/src/spdx/jsonschema/file_properties.py
index 8706a092f..7b308134a 100644
--- a/src/spdx/jsonschema/file_properties.py
+++ b/src/spdx/jsonschema/file_properties.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from enum import auto
 
 from spdx.jsonschema.json_property import JsonProperty
diff --git a/src/spdx/jsonschema/json_property.py b/src/spdx/jsonschema/json_property.py
index fa0114bac..7e7cd27f3 100644
--- a/src/spdx/jsonschema/json_property.py
+++ b/src/spdx/jsonschema/json_property.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from enum import Enum
 
 
diff --git a/src/spdx/jsonschema/optional_utils.py b/src/spdx/jsonschema/optional_utils.py
index 3d5d6746a..a204015ad 100644
--- a/src/spdx/jsonschema/optional_utils.py
+++ b/src/spdx/jsonschema/optional_utils.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import Callable, Optional, TypeVar
 
 T = TypeVar("T")
diff --git a/src/spdx/jsonschema/package_converter.py b/src/spdx/jsonschema/package_converter.py
index da70b9720..86ea5aeb4 100644
--- a/src/spdx/jsonschema/package_converter.py
+++ b/src/spdx/jsonschema/package_converter.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import Any, Type
 
 from spdx.datetime_conversions import datetime_to_iso_string
diff --git a/src/spdx/jsonschema/package_properties.py b/src/spdx/jsonschema/package_properties.py
index b59d94723..f62ce2fbb 100644
--- a/src/spdx/jsonschema/package_properties.py
+++ b/src/spdx/jsonschema/package_properties.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from enum import auto
 
 from spdx.jsonschema.json_property import JsonProperty
diff --git a/src/spdx/jsonschema/package_verification_code_converter.py b/src/spdx/jsonschema/package_verification_code_converter.py
index df72b9dcd..13959ace3 100644
--- a/src/spdx/jsonschema/package_verification_code_converter.py
+++ b/src/spdx/jsonschema/package_verification_code_converter.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import Any, Type
 
 from spdx.jsonschema.converter import TypedConverter
diff --git a/src/spdx/jsonschema/package_verification_code_properties.py b/src/spdx/jsonschema/package_verification_code_properties.py
index 845058469..7499c5acd 100644
--- a/src/spdx/jsonschema/package_verification_code_properties.py
+++ b/src/spdx/jsonschema/package_verification_code_properties.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from enum import auto
 
 from spdx.jsonschema.json_property import JsonProperty
diff --git a/src/spdx/jsonschema/relationship_converter.py b/src/spdx/jsonschema/relationship_converter.py
index b2482f640..5527f2551 100644
--- a/src/spdx/jsonschema/relationship_converter.py
+++ b/src/spdx/jsonschema/relationship_converter.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import Any, Type
 
 from spdx.jsonschema.converter import TypedConverter
diff --git a/src/spdx/jsonschema/relationship_properties.py b/src/spdx/jsonschema/relationship_properties.py
index f5461f1ce..a96d1f287 100644
--- a/src/spdx/jsonschema/relationship_properties.py
+++ b/src/spdx/jsonschema/relationship_properties.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from enum import auto
 
 from spdx.jsonschema.json_property import JsonProperty
diff --git a/src/spdx/jsonschema/snippet_converter.py b/src/spdx/jsonschema/snippet_converter.py
index d26e20ad5..b80907e9a 100644
--- a/src/spdx/jsonschema/snippet_converter.py
+++ b/src/spdx/jsonschema/snippet_converter.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import Any, Dict, Tuple, Type
 
 from spdx.jsonschema.annotation_converter import AnnotationConverter
diff --git a/src/spdx/jsonschema/snippet_properties.py b/src/spdx/jsonschema/snippet_properties.py
index 2fd5eadd8..0ee8ba324 100644
--- a/src/spdx/jsonschema/snippet_properties.py
+++ b/src/spdx/jsonschema/snippet_properties.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from enum import auto
 
 from spdx.jsonschema.json_property import JsonProperty
diff --git a/src/spdx/model/actor.py b/src/spdx/model/actor.py
index 022954f3a..66e38bd83 100644
--- a/src/spdx/model/actor.py
+++ b/src/spdx/model/actor.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from enum import Enum, auto
 from typing import Optional
 
diff --git a/src/spdx/model/annotation.py b/src/spdx/model/annotation.py
index 2cfe0b212..0718191b6 100644
--- a/src/spdx/model/annotation.py
+++ b/src/spdx/model/annotation.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from datetime import datetime
 from enum import Enum, auto
 
diff --git a/src/spdx/model/checksum.py b/src/spdx/model/checksum.py
index 4e9249615..e4f121086 100644
--- a/src/spdx/model/checksum.py
+++ b/src/spdx/model/checksum.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from enum import Enum, auto
 
 from common.typing.dataclass_with_properties import dataclass_with_properties
diff --git a/src/spdx/model/document.py b/src/spdx/model/document.py
index d727955ec..e083cd4fa 100644
--- a/src/spdx/model/document.py
+++ b/src/spdx/model/document.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from dataclasses import field
 from datetime import datetime
 from typing import List, Optional
diff --git a/src/spdx/model/external_document_ref.py b/src/spdx/model/external_document_ref.py
index f99ad545f..35c045f2a 100644
--- a/src/spdx/model/external_document_ref.py
+++ b/src/spdx/model/external_document_ref.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 from common.typing.dataclass_with_properties import dataclass_with_properties
 from common.typing.type_checks import check_types_and_set_values
diff --git a/src/spdx/model/extracted_licensing_info.py b/src/spdx/model/extracted_licensing_info.py
index 4d05a079f..3133f9e5f 100644
--- a/src/spdx/model/extracted_licensing_info.py
+++ b/src/spdx/model/extracted_licensing_info.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from dataclasses import field
 from typing import List, Optional, Union
 
diff --git a/src/spdx/model/file.py b/src/spdx/model/file.py
index 6205ff998..db51ab511 100644
--- a/src/spdx/model/file.py
+++ b/src/spdx/model/file.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from dataclasses import field
 from enum import Enum, auto
 from typing import List, Optional, Union
diff --git a/src/spdx/model/package.py b/src/spdx/model/package.py
index 2aa8731b4..b468d576c 100644
--- a/src/spdx/model/package.py
+++ b/src/spdx/model/package.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from dataclasses import field
 from datetime import datetime
 from enum import Enum, auto
diff --git a/src/spdx/model/relationship.py b/src/spdx/model/relationship.py
index 19ecc2d8b..565de3f74 100644
--- a/src/spdx/model/relationship.py
+++ b/src/spdx/model/relationship.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from enum import Enum, auto
 from typing import Optional, Union
 
diff --git a/src/spdx/model/relationship_filters.py b/src/spdx/model/relationship_filters.py
index 394a89479..f2e8a856a 100644
--- a/src/spdx/model/relationship_filters.py
+++ b/src/spdx/model/relationship_filters.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import List
 
 from spdx.model.document import Document
diff --git a/src/spdx/model/snippet.py b/src/spdx/model/snippet.py
index 2b12a7fc9..6b39cbae0 100644
--- a/src/spdx/model/snippet.py
+++ b/src/spdx/model/snippet.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from dataclasses import field
 from typing import List, Optional, Tuple, Union
 
diff --git a/src/spdx/model/spdx_no_assertion.py b/src/spdx/model/spdx_no_assertion.py
index 3a12ed36c..3f02d10b9 100644
--- a/src/spdx/model/spdx_no_assertion.py
+++ b/src/spdx/model/spdx_no_assertion.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 SPDX_NO_ASSERTION_STRING = "NOASSERTION"
 
diff --git a/src/spdx/model/spdx_none.py b/src/spdx/model/spdx_none.py
index e4e97c534..b44b705b3 100644
--- a/src/spdx/model/spdx_none.py
+++ b/src/spdx/model/spdx_none.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 SPDX_NONE_STRING = "NONE"
 
diff --git a/src/spdx/model/version.py b/src/spdx/model/version.py
index 94a586d62..c045ef8ae 100644
--- a/src/spdx/model/version.py
+++ b/src/spdx/model/version.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 
 import re
diff --git a/src/spdx/parser/actor_parser.py b/src/spdx/parser/actor_parser.py
index 3ac5ddb9e..3266a51b0 100644
--- a/src/spdx/parser/actor_parser.py
+++ b/src/spdx/parser/actor_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import re
 from typing import Match, Optional, Pattern
 
diff --git a/src/spdx/parser/error.py b/src/spdx/parser/error.py
index 580c4cfad..a0e7678e3 100644
--- a/src/spdx/parser/error.py
+++ b/src/spdx/parser/error.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import List
 
 
diff --git a/src/spdx/parser/json/json_parser.py b/src/spdx/parser/json/json_parser.py
index 9ee169b3c..24f10a5ca 100644
--- a/src/spdx/parser/json/json_parser.py
+++ b/src/spdx/parser/json/json_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import json
 from typing import Dict
 
diff --git a/src/spdx/parser/jsonlikedict/annotation_parser.py b/src/spdx/parser/jsonlikedict/annotation_parser.py
index 72338179a..2ac696d09 100644
--- a/src/spdx/parser/jsonlikedict/annotation_parser.py
+++ b/src/spdx/parser/jsonlikedict/annotation_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from datetime import datetime
 from typing import Dict, List, Optional
 
diff --git a/src/spdx/parser/jsonlikedict/checksum_parser.py b/src/spdx/parser/jsonlikedict/checksum_parser.py
index de09fc4ed..bf2070727 100644
--- a/src/spdx/parser/jsonlikedict/checksum_parser.py
+++ b/src/spdx/parser/jsonlikedict/checksum_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import Dict, Optional
 
 from spdx.model.checksum import Checksum, ChecksumAlgorithm
diff --git a/src/spdx/parser/jsonlikedict/creation_info_parser.py b/src/spdx/parser/jsonlikedict/creation_info_parser.py
index 835aa6702..bb7a2935b 100644
--- a/src/spdx/parser/jsonlikedict/creation_info_parser.py
+++ b/src/spdx/parser/jsonlikedict/creation_info_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from datetime import datetime
 from typing import Dict, List, Optional
 
diff --git a/src/spdx/parser/jsonlikedict/dict_parsing_functions.py b/src/spdx/parser/jsonlikedict/dict_parsing_functions.py
index 4e791f6b4..57cdd710f 100644
--- a/src/spdx/parser/jsonlikedict/dict_parsing_functions.py
+++ b/src/spdx/parser/jsonlikedict/dict_parsing_functions.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import Any, Callable, Dict, List, Optional
 
 from spdx.model.spdx_no_assertion import SpdxNoAssertion
diff --git a/src/spdx/parser/jsonlikedict/extracted_licensing_info_parser.py b/src/spdx/parser/jsonlikedict/extracted_licensing_info_parser.py
index 65ec7495f..6190d38bd 100644
--- a/src/spdx/parser/jsonlikedict/extracted_licensing_info_parser.py
+++ b/src/spdx/parser/jsonlikedict/extracted_licensing_info_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import Dict, List, Optional, Union
 
 from spdx.model.extracted_licensing_info import ExtractedLicensingInfo
diff --git a/src/spdx/parser/jsonlikedict/file_parser.py b/src/spdx/parser/jsonlikedict/file_parser.py
index 501ba4b76..f671ccb36 100644
--- a/src/spdx/parser/jsonlikedict/file_parser.py
+++ b/src/spdx/parser/jsonlikedict/file_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import Dict, List, Optional, Union
 
 from license_expression import LicenseExpression
diff --git a/src/spdx/parser/jsonlikedict/json_like_dict_parser.py b/src/spdx/parser/jsonlikedict/json_like_dict_parser.py
index 148cd4dd2..1073fb57b 100644
--- a/src/spdx/parser/jsonlikedict/json_like_dict_parser.py
+++ b/src/spdx/parser/jsonlikedict/json_like_dict_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import Dict
 
 from spdx.model.document import Document
diff --git a/src/spdx/parser/jsonlikedict/license_expression_parser.py b/src/spdx/parser/jsonlikedict/license_expression_parser.py
index 74ce63034..73e0b4ba3 100644
--- a/src/spdx/parser/jsonlikedict/license_expression_parser.py
+++ b/src/spdx/parser/jsonlikedict/license_expression_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import Union
 
 from license_expression import ExpressionError, LicenseExpression, Licensing
diff --git a/src/spdx/parser/jsonlikedict/package_parser.py b/src/spdx/parser/jsonlikedict/package_parser.py
index 9ed80c0ee..afb12dc7f 100644
--- a/src/spdx/parser/jsonlikedict/package_parser.py
+++ b/src/spdx/parser/jsonlikedict/package_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from datetime import datetime
 from typing import Dict, List, Optional, Union
 
diff --git a/src/spdx/parser/jsonlikedict/relationship_parser.py b/src/spdx/parser/jsonlikedict/relationship_parser.py
index 4d72f851a..d1d0ae8a8 100644
--- a/src/spdx/parser/jsonlikedict/relationship_parser.py
+++ b/src/spdx/parser/jsonlikedict/relationship_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import Dict, List, Optional
 
 from common.typing.constructor_type_errors import ConstructorTypeErrors
diff --git a/src/spdx/parser/jsonlikedict/snippet_parser.py b/src/spdx/parser/jsonlikedict/snippet_parser.py
index 548a3eb6f..0a6fbcbb9 100644
--- a/src/spdx/parser/jsonlikedict/snippet_parser.py
+++ b/src/spdx/parser/jsonlikedict/snippet_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from enum import Enum, auto
 from typing import Dict, List, Optional, Tuple, Union
 
diff --git a/src/spdx/parser/logger.py b/src/spdx/parser/logger.py
index 312a959d0..4ebc1479d 100644
--- a/src/spdx/parser/logger.py
+++ b/src/spdx/parser/logger.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import List
 
 
diff --git a/src/spdx/parser/parsing_functions.py b/src/spdx/parser/parsing_functions.py
index f8cd3ce25..32d2f3184 100644
--- a/src/spdx/parser/parsing_functions.py
+++ b/src/spdx/parser/parsing_functions.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import Any, Dict
 
 from common.typing.constructor_type_errors import ConstructorTypeErrors
diff --git a/src/spdx/parser/rdf/annotation_parser.py b/src/spdx/parser/rdf/annotation_parser.py
index 80d6229bf..6f6a0a39f 100644
--- a/src/spdx/parser/rdf/annotation_parser.py
+++ b/src/spdx/parser/rdf/annotation_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from rdflib import RDFS, Graph, URIRef
 
 from spdx.datetime_conversions import datetime_from_str
diff --git a/src/spdx/parser/rdf/checksum_parser.py b/src/spdx/parser/rdf/checksum_parser.py
index 91fd82244..57dd247f2 100644
--- a/src/spdx/parser/rdf/checksum_parser.py
+++ b/src/spdx/parser/rdf/checksum_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from rdflib import Graph, URIRef
 
 from spdx.model.checksum import Checksum, ChecksumAlgorithm
diff --git a/src/spdx/parser/rdf/creation_info_parser.py b/src/spdx/parser/rdf/creation_info_parser.py
index 57e63ca9d..938becb6e 100644
--- a/src/spdx/parser/rdf/creation_info_parser.py
+++ b/src/spdx/parser/rdf/creation_info_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import logging
 import sys
 from typing import Tuple
diff --git a/src/spdx/parser/rdf/extracted_licensing_info_parser.py b/src/spdx/parser/rdf/extracted_licensing_info_parser.py
index 2fa598696..663c2e260 100644
--- a/src/spdx/parser/rdf/extracted_licensing_info_parser.py
+++ b/src/spdx/parser/rdf/extracted_licensing_info_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from rdflib import RDFS, Graph, URIRef
 
 from spdx.model.extracted_licensing_info import ExtractedLicensingInfo
diff --git a/src/spdx/parser/rdf/file_parser.py b/src/spdx/parser/rdf/file_parser.py
index 5f0a0a5cd..c42b6d1e5 100644
--- a/src/spdx/parser/rdf/file_parser.py
+++ b/src/spdx/parser/rdf/file_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from rdflib import RDFS, Graph, URIRef
 
 from spdx.model.file import File, FileType
diff --git a/src/spdx/parser/rdf/graph_parsing_functions.py b/src/spdx/parser/rdf/graph_parsing_functions.py
index 297f6e9ba..5accd10d9 100644
--- a/src/spdx/parser/rdf/graph_parsing_functions.py
+++ b/src/spdx/parser/rdf/graph_parsing_functions.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from enum import Enum
 from typing import Any, Callable, Optional, Type
 
diff --git a/src/spdx/parser/rdf/license_expression_parser.py b/src/spdx/parser/rdf/license_expression_parser.py
index 346fd5143..629b3fe9c 100644
--- a/src/spdx/parser/rdf/license_expression_parser.py
+++ b/src/spdx/parser/rdf/license_expression_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import Union
 
 from license_expression import LicenseExpression, get_spdx_licensing
diff --git a/src/spdx/parser/rdf/package_parser.py b/src/spdx/parser/rdf/package_parser.py
index 0301ecdee..b4be7fdae 100644
--- a/src/spdx/parser/rdf/package_parser.py
+++ b/src/spdx/parser/rdf/package_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import Optional
 
 from rdflib import DOAP, RDFS, Graph, URIRef
diff --git a/src/spdx/parser/rdf/rdf_parser.py b/src/spdx/parser/rdf/rdf_parser.py
index 60f0bfb9f..ae6baf3bc 100644
--- a/src/spdx/parser/rdf/rdf_parser.py
+++ b/src/spdx/parser/rdf/rdf_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from rdflib import RDF, Graph
 
 from spdx.model.document import Document
diff --git a/src/spdx/parser/rdf/relationship_parser.py b/src/spdx/parser/rdf/relationship_parser.py
index e0bb13e17..44d840e95 100644
--- a/src/spdx/parser/rdf/relationship_parser.py
+++ b/src/spdx/parser/rdf/relationship_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from rdflib import RDFS, Graph, URIRef
 
 from spdx.model.relationship import Relationship, RelationshipType
diff --git a/src/spdx/parser/rdf/snippet_parser.py b/src/spdx/parser/rdf/snippet_parser.py
index 6a69306f3..284e1328a 100644
--- a/src/spdx/parser/rdf/snippet_parser.py
+++ b/src/spdx/parser/rdf/snippet_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import Dict, Optional, Tuple
 
 from rdflib import RDF, RDFS, Graph
diff --git a/src/spdx/parser/tagvalue/helper_methods.py b/src/spdx/parser/tagvalue/helper_methods.py
index 3814b3d29..ef904cfa3 100644
--- a/src/spdx/parser/tagvalue/helper_methods.py
+++ b/src/spdx/parser/tagvalue/helper_methods.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import re
 from typing import Any, Callable, Dict, Optional
 
diff --git a/src/spdx/parser/tagvalue/lexer.py b/src/spdx/parser/tagvalue/lexer.py
index 7556267b7..9a857827b 100644
--- a/src/spdx/parser/tagvalue/lexer.py
+++ b/src/spdx/parser/tagvalue/lexer.py
@@ -1,5 +1,6 @@
 # Copyright (c) 2014 Ahmed H. Ismail
 # Copyright (c) 2023 spdx contributors
+# 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
diff --git a/src/spdx/parser/tagvalue/parser.py b/src/spdx/parser/tagvalue/parser.py
index 8f4ec2790..e52e6c9bf 100644
--- a/src/spdx/parser/tagvalue/parser.py
+++ b/src/spdx/parser/tagvalue/parser.py
@@ -1,5 +1,6 @@
 # Copyright (c) 2014 Ahmed H. Ismail
 # Copyright (c) 2023 spdx contributors
+# 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
diff --git a/src/spdx/parser/tagvalue/tagvalue_parser.py b/src/spdx/parser/tagvalue/tagvalue_parser.py
index d71c3c047..948c97e78 100644
--- a/src/spdx/parser/tagvalue/tagvalue_parser.py
+++ b/src/spdx/parser/tagvalue/tagvalue_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from spdx.model.document import Document
 from spdx.parser.tagvalue.parser import Parser
 
diff --git a/src/spdx/parser/xml/xml_parser.py b/src/spdx/parser/xml/xml_parser.py
index 9f9189a45..61c24edaa 100644
--- a/src/spdx/parser/xml/xml_parser.py
+++ b/src/spdx/parser/xml/xml_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import Any, Dict
 
 import xmltodict
diff --git a/src/spdx/parser/yaml/yaml_parser.py b/src/spdx/parser/yaml/yaml_parser.py
index b3750938d..4cfa9e5bf 100644
--- a/src/spdx/parser/yaml/yaml_parser.py
+++ b/src/spdx/parser/yaml/yaml_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import Dict
 
 import yaml
diff --git a/src/spdx/rdfschema/namespace.py b/src/spdx/rdfschema/namespace.py
index b29f55ad5..822872c54 100644
--- a/src/spdx/rdfschema/namespace.py
+++ b/src/spdx/rdfschema/namespace.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from rdflib import Namespace
 
 SPDX_NAMESPACE = Namespace("http://spdx.org/rdf/terms#")
diff --git a/src/spdx/validation/actor_validator.py b/src/spdx/validation/actor_validator.py
index 192b95774..a1c3fecea 100644
--- a/src/spdx/validation/actor_validator.py
+++ b/src/spdx/validation/actor_validator.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 from typing import List
 
diff --git a/src/spdx/validation/annotation_validator.py b/src/spdx/validation/annotation_validator.py
index e162f2d1c..6e7774658 100644
--- a/src/spdx/validation/annotation_validator.py
+++ b/src/spdx/validation/annotation_validator.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 from typing import List
 
diff --git a/src/spdx/validation/checksum_validator.py b/src/spdx/validation/checksum_validator.py
index f34cc0a2e..c5221598a 100644
--- a/src/spdx/validation/checksum_validator.py
+++ b/src/spdx/validation/checksum_validator.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 import re
 from typing import Dict, List
diff --git a/src/spdx/validation/creation_info_validator.py b/src/spdx/validation/creation_info_validator.py
index a73e98635..5650d9945 100644
--- a/src/spdx/validation/creation_info_validator.py
+++ b/src/spdx/validation/creation_info_validator.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 from typing import List
 
diff --git a/src/spdx/validation/document_validator.py b/src/spdx/validation/document_validator.py
index 1446ce1bb..0db5ef98a 100644
--- a/src/spdx/validation/document_validator.py
+++ b/src/spdx/validation/document_validator.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import List
 
 from spdx.model.document import Document
diff --git a/src/spdx/validation/external_document_ref_validator.py b/src/spdx/validation/external_document_ref_validator.py
index 6cd20d2da..3089bb0f2 100644
--- a/src/spdx/validation/external_document_ref_validator.py
+++ b/src/spdx/validation/external_document_ref_validator.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 from typing import List
 
diff --git a/src/spdx/validation/external_package_ref_validator.py b/src/spdx/validation/external_package_ref_validator.py
index 8105ec0f6..429caf422 100644
--- a/src/spdx/validation/external_package_ref_validator.py
+++ b/src/spdx/validation/external_package_ref_validator.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import re
 from typing import Dict, List
 
diff --git a/src/spdx/validation/extracted_licensing_info_validator.py b/src/spdx/validation/extracted_licensing_info_validator.py
index a1def8ae7..bb8f76281 100644
--- a/src/spdx/validation/extracted_licensing_info_validator.py
+++ b/src/spdx/validation/extracted_licensing_info_validator.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 import re
 from typing import List, Optional
diff --git a/src/spdx/validation/file_validator.py b/src/spdx/validation/file_validator.py
index c90cbc868..1f9e666c9 100644
--- a/src/spdx/validation/file_validator.py
+++ b/src/spdx/validation/file_validator.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 from typing import List, Optional
 
diff --git a/src/spdx/validation/license_expression_validator.py b/src/spdx/validation/license_expression_validator.py
index ebf6e4ae8..e4af4ee5e 100644
--- a/src/spdx/validation/license_expression_validator.py
+++ b/src/spdx/validation/license_expression_validator.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 from typing import List, Optional, Union
 
diff --git a/src/spdx/validation/package_validator.py b/src/spdx/validation/package_validator.py
index ab68757e1..ed22dbe83 100644
--- a/src/spdx/validation/package_validator.py
+++ b/src/spdx/validation/package_validator.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 from typing import List, Optional
 
diff --git a/src/spdx/validation/package_verification_code_validator.py b/src/spdx/validation/package_verification_code_validator.py
index b059dc69c..3ca65249f 100644
--- a/src/spdx/validation/package_verification_code_validator.py
+++ b/src/spdx/validation/package_verification_code_validator.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 import re
 from typing import List
diff --git a/src/spdx/validation/relationship_validator.py b/src/spdx/validation/relationship_validator.py
index 11268d07c..bad94f78f 100644
--- a/src/spdx/validation/relationship_validator.py
+++ b/src/spdx/validation/relationship_validator.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 from typing import List
 
diff --git a/src/spdx/validation/snippet_validator.py b/src/spdx/validation/snippet_validator.py
index c709b1d37..f312308f3 100644
--- a/src/spdx/validation/snippet_validator.py
+++ b/src/spdx/validation/snippet_validator.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 from typing import List, Optional
 
diff --git a/src/spdx/validation/spdx_id_validators.py b/src/spdx/validation/spdx_id_validators.py
index 29164df65..00c80f11d 100644
--- a/src/spdx/validation/spdx_id_validators.py
+++ b/src/spdx/validation/spdx_id_validators.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 import re
 from typing import List
diff --git a/src/spdx/validation/uri_validators.py b/src/spdx/validation/uri_validators.py
index 8d57c997c..68bbed6dc 100644
--- a/src/spdx/validation/uri_validators.py
+++ b/src/spdx/validation/uri_validators.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 import re
 from typing import List
diff --git a/src/spdx/validation/validation_message.py b/src/spdx/validation/validation_message.py
index c1679f1c7..21af28cb4 100644
--- a/src/spdx/validation/validation_message.py
+++ b/src/spdx/validation/validation_message.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 from dataclasses import dataclass
 from enum import Enum, auto
diff --git a/src/spdx/writer/json/json_writer.py b/src/spdx/writer/json/json_writer.py
index 4cfef383a..97a29d598 100644
--- a/src/spdx/writer/json/json_writer.py
+++ b/src/spdx/writer/json/json_writer.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import json
 from typing import List
 
diff --git a/src/spdx/writer/rdf/annotation_writer.py b/src/spdx/writer/rdf/annotation_writer.py
index 6aa234ae6..4b288b9ad 100644
--- a/src/spdx/writer/rdf/annotation_writer.py
+++ b/src/spdx/writer/rdf/annotation_writer.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import Dict
 
 from rdflib import RDF, RDFS, BNode, Graph, Literal, URIRef
diff --git a/src/spdx/writer/rdf/checksum_writer.py b/src/spdx/writer/rdf/checksum_writer.py
index 335b89d31..1cc9ab6b5 100644
--- a/src/spdx/writer/rdf/checksum_writer.py
+++ b/src/spdx/writer/rdf/checksum_writer.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from rdflib import RDF, BNode, Graph, Literal, URIRef
 
 from spdx.model.checksum import Checksum, ChecksumAlgorithm
diff --git a/src/spdx/writer/rdf/creation_info_writer.py b/src/spdx/writer/rdf/creation_info_writer.py
index 795ed2f1e..0e792ece1 100644
--- a/src/spdx/writer/rdf/creation_info_writer.py
+++ b/src/spdx/writer/rdf/creation_info_writer.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from rdflib import RDF, RDFS, BNode, Graph, Literal, URIRef
 
 from spdx.datetime_conversions import datetime_to_iso_string
diff --git a/src/spdx/writer/rdf/external_document_ref_writer.py b/src/spdx/writer/rdf/external_document_ref_writer.py
index 85ef8da65..f652ff552 100644
--- a/src/spdx/writer/rdf/external_document_ref_writer.py
+++ b/src/spdx/writer/rdf/external_document_ref_writer.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from rdflib import RDF, Graph, URIRef
 
 from spdx.model.external_document_ref import ExternalDocumentRef
diff --git a/src/spdx/writer/rdf/extracted_licensing_info_writer.py b/src/spdx/writer/rdf/extracted_licensing_info_writer.py
index 96bd3888e..d6af55f9c 100644
--- a/src/spdx/writer/rdf/extracted_licensing_info_writer.py
+++ b/src/spdx/writer/rdf/extracted_licensing_info_writer.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from rdflib import RDF, RDFS, BNode, Graph, Literal, URIRef
 
 from spdx.model.extracted_licensing_info import ExtractedLicensingInfo
diff --git a/src/spdx/writer/rdf/file_writer.py b/src/spdx/writer/rdf/file_writer.py
index c896cdea8..6bbcf637f 100644
--- a/src/spdx/writer/rdf/file_writer.py
+++ b/src/spdx/writer/rdf/file_writer.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import Dict
 
 from rdflib import RDF, RDFS, Graph, Literal, URIRef
diff --git a/src/spdx/writer/rdf/license_expression_writer.py b/src/spdx/writer/rdf/license_expression_writer.py
index bb584817f..a6e230a41 100644
--- a/src/spdx/writer/rdf/license_expression_writer.py
+++ b/src/spdx/writer/rdf/license_expression_writer.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import List, Union
 
 from boolean import Expression
diff --git a/src/spdx/writer/rdf/package_writer.py b/src/spdx/writer/rdf/package_writer.py
index 84cf94b8d..83db8e11a 100644
--- a/src/spdx/writer/rdf/package_writer.py
+++ b/src/spdx/writer/rdf/package_writer.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import Dict
 
 from rdflib import DOAP, RDF, RDFS, XSD, BNode, Graph, Literal, URIRef
diff --git a/src/spdx/writer/rdf/rdf_writer.py b/src/spdx/writer/rdf/rdf_writer.py
index 64daf7389..fb6aeed1d 100644
--- a/src/spdx/writer/rdf/rdf_writer.py
+++ b/src/spdx/writer/rdf/rdf_writer.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import Dict, List
 
 from rdflib import DOAP, Graph
diff --git a/src/spdx/writer/rdf/relationship_writer.py b/src/spdx/writer/rdf/relationship_writer.py
index a59a2f537..9435ee433 100644
--- a/src/spdx/writer/rdf/relationship_writer.py
+++ b/src/spdx/writer/rdf/relationship_writer.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import Dict
 
 from rdflib import RDF, RDFS, BNode, Graph, Literal, URIRef
diff --git a/src/spdx/writer/rdf/snippet_writer.py b/src/spdx/writer/rdf/snippet_writer.py
index ab50ddd9d..d4c8e7024 100644
--- a/src/spdx/writer/rdf/snippet_writer.py
+++ b/src/spdx/writer/rdf/snippet_writer.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import Dict, Optional, Tuple
 
 from rdflib import RDF, RDFS, BNode, Graph, Literal, URIRef
diff --git a/src/spdx/writer/rdf/writer_utils.py b/src/spdx/writer/rdf/writer_utils.py
index cfbe3b42e..6e18ccf44 100644
--- a/src/spdx/writer/rdf/writer_utils.py
+++ b/src/spdx/writer/rdf/writer_utils.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import logging
 from datetime import datetime
 from typing import Any, Dict, Optional
diff --git a/src/spdx/writer/write_anything.py b/src/spdx/writer/write_anything.py
index b3ba5248e..7e97654eb 100644
--- a/src/spdx/writer/write_anything.py
+++ b/src/spdx/writer/write_anything.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from spdx.formats import FileFormat, file_name_to_format
 from spdx.model.document import Document
 from spdx.writer.json import json_writer
diff --git a/src/spdx/writer/xml/xml_writer.py b/src/spdx/writer/xml/xml_writer.py
index d347b7d6d..0bc6a47aa 100644
--- a/src/spdx/writer/xml/xml_writer.py
+++ b/src/spdx/writer/xml/xml_writer.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import List
 
 import xmltodict
diff --git a/src/spdx/writer/yaml/yaml_writer.py b/src/spdx/writer/yaml/yaml_writer.py
index 2dc365f95..7a9536816 100644
--- a/src/spdx/writer/yaml/yaml_writer.py
+++ b/src/spdx/writer/yaml/yaml_writer.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from typing import List
 
 import yaml
diff --git a/tests/spdx/fixtures.py b/tests/spdx/fixtures.py
index 6bfe9f72d..d8588214e 100644
--- a/tests/spdx/fixtures.py
+++ b/tests/spdx/fixtures.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from datetime import datetime
 
 from license_expression import get_spdx_licensing
diff --git a/tests/spdx/jsonschema/test_annotation_converter.py b/tests/spdx/jsonschema/test_annotation_converter.py
index 15b2d17f8..61facc040 100644
--- a/tests/spdx/jsonschema/test_annotation_converter.py
+++ b/tests/spdx/jsonschema/test_annotation_converter.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from datetime import datetime
 
 import pytest
diff --git a/tests/spdx/jsonschema/test_checksum_converter.py b/tests/spdx/jsonschema/test_checksum_converter.py
index 60393d7e6..5808a0682 100644
--- a/tests/spdx/jsonschema/test_checksum_converter.py
+++ b/tests/spdx/jsonschema/test_checksum_converter.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import pytest
 
 from spdx.jsonschema.checksum_converter import ChecksumConverter
diff --git a/tests/spdx/jsonschema/test_converter.py b/tests/spdx/jsonschema/test_converter.py
index e5dff510b..f5bae70a4 100644
--- a/tests/spdx/jsonschema/test_converter.py
+++ b/tests/spdx/jsonschema/test_converter.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from enum import auto
 from typing import Any, Type
 
diff --git a/tests/spdx/jsonschema/test_creation_info_converter.py b/tests/spdx/jsonschema/test_creation_info_converter.py
index f527b586f..5921d911f 100644
--- a/tests/spdx/jsonschema/test_creation_info_converter.py
+++ b/tests/spdx/jsonschema/test_creation_info_converter.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from datetime import datetime
 
 import pytest
diff --git a/tests/spdx/jsonschema/test_document_converter.py b/tests/spdx/jsonschema/test_document_converter.py
index 8832b852f..7bb1d5ac5 100644
--- a/tests/spdx/jsonschema/test_document_converter.py
+++ b/tests/spdx/jsonschema/test_document_converter.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from datetime import datetime
 from typing import Union
 from unittest import mock
diff --git a/tests/spdx/jsonschema/test_external_document_ref_converter.py b/tests/spdx/jsonschema/test_external_document_ref_converter.py
index 53bfb3bd4..a6437d604 100644
--- a/tests/spdx/jsonschema/test_external_document_ref_converter.py
+++ b/tests/spdx/jsonschema/test_external_document_ref_converter.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from unittest import mock
 from unittest.mock import MagicMock
 
diff --git a/tests/spdx/jsonschema/test_external_package_ref_converter.py b/tests/spdx/jsonschema/test_external_package_ref_converter.py
index 323df18d4..016aa75c4 100644
--- a/tests/spdx/jsonschema/test_external_package_ref_converter.py
+++ b/tests/spdx/jsonschema/test_external_package_ref_converter.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import pytest
 
 from spdx.jsonschema.external_package_ref_converter import ExternalPackageRefConverter
diff --git a/tests/spdx/jsonschema/test_extracted_licensing_info_converter.py b/tests/spdx/jsonschema/test_extracted_licensing_info_converter.py
index 7d62fa150..19324e961 100644
--- a/tests/spdx/jsonschema/test_extracted_licensing_info_converter.py
+++ b/tests/spdx/jsonschema/test_extracted_licensing_info_converter.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import pytest
 
 from spdx.jsonschema.extracted_licensing_info_converter import ExtractedLicensingInfoConverter
diff --git a/tests/spdx/jsonschema/test_file_converter.py b/tests/spdx/jsonschema/test_file_converter.py
index e78e63681..076ecdd90 100644
--- a/tests/spdx/jsonschema/test_file_converter.py
+++ b/tests/spdx/jsonschema/test_file_converter.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from datetime import datetime
 from typing import Union
 from unittest import mock
diff --git a/tests/spdx/jsonschema/test_package_converter.py b/tests/spdx/jsonschema/test_package_converter.py
index 31516fa0f..bff476822 100644
--- a/tests/spdx/jsonschema/test_package_converter.py
+++ b/tests/spdx/jsonschema/test_package_converter.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from datetime import datetime
 from typing import Union
 from unittest import mock
diff --git a/tests/spdx/jsonschema/test_package_verification_code_converter.py b/tests/spdx/jsonschema/test_package_verification_code_converter.py
index 66daf34e0..e506676a6 100644
--- a/tests/spdx/jsonschema/test_package_verification_code_converter.py
+++ b/tests/spdx/jsonschema/test_package_verification_code_converter.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import pytest
 
 from spdx.jsonschema.package_verification_code_converter import PackageVerificationCodeConverter
diff --git a/tests/spdx/jsonschema/test_relationship_converter.py b/tests/spdx/jsonschema/test_relationship_converter.py
index d03d6271d..2b78bf9e4 100644
--- a/tests/spdx/jsonschema/test_relationship_converter.py
+++ b/tests/spdx/jsonschema/test_relationship_converter.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import pytest
 
 from spdx.jsonschema.relationship_converter import RelationshipConverter
diff --git a/tests/spdx/jsonschema/test_snippet_converter.py b/tests/spdx/jsonschema/test_snippet_converter.py
index a77b70ea0..baceeffbd 100644
--- a/tests/spdx/jsonschema/test_snippet_converter.py
+++ b/tests/spdx/jsonschema/test_snippet_converter.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from datetime import datetime
 from typing import Union
 from unittest import mock
diff --git a/tests/spdx/mock_utils.py b/tests/spdx/mock_utils.py
index c99715903..075b51117 100644
--- a/tests/spdx/mock_utils.py
+++ b/tests/spdx/mock_utils.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from unittest.mock import NonCallableMagicMock
 
 
diff --git a/tests/spdx/model/test_version.py b/tests/spdx/model/test_version.py
index 574a5faa2..ab6a719d1 100644
--- a/tests/spdx/model/test_version.py
+++ b/tests/spdx/model/test_version.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 
 import pytest
diff --git a/tests/spdx/parser/json/test_json_parser.py b/tests/spdx/parser/json/test_json_parser.py
index b61a01ad8..e14fb510c 100644
--- a/tests/spdx/parser/json/test_json_parser.py
+++ b/tests/spdx/parser/json/test_json_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 import os
 
diff --git a/tests/spdx/parser/jsonlikedict/test_annotation_parser.py b/tests/spdx/parser/jsonlikedict/test_annotation_parser.py
index 439883433..ed7af5334 100644
--- a/tests/spdx/parser/jsonlikedict/test_annotation_parser.py
+++ b/tests/spdx/parser/jsonlikedict/test_annotation_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import datetime
 from unittest import TestCase
 
diff --git a/tests/spdx/parser/jsonlikedict/test_checksum_parser.py b/tests/spdx/parser/jsonlikedict/test_checksum_parser.py
index 536b02040..a64289b48 100644
--- a/tests/spdx/parser/jsonlikedict/test_checksum_parser.py
+++ b/tests/spdx/parser/jsonlikedict/test_checksum_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from unittest import TestCase
 
 import pytest
diff --git a/tests/spdx/parser/jsonlikedict/test_creation_info_parser.py b/tests/spdx/parser/jsonlikedict/test_creation_info_parser.py
index 219daecb3..aab81b3cc 100644
--- a/tests/spdx/parser/jsonlikedict/test_creation_info_parser.py
+++ b/tests/spdx/parser/jsonlikedict/test_creation_info_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from datetime import datetime
 from unittest import TestCase
 
diff --git a/tests/spdx/parser/jsonlikedict/test_extracted_licensing_info_parser.py b/tests/spdx/parser/jsonlikedict/test_extracted_licensing_info_parser.py
index b7abde4ae..71d25f325 100644
--- a/tests/spdx/parser/jsonlikedict/test_extracted_licensing_info_parser.py
+++ b/tests/spdx/parser/jsonlikedict/test_extracted_licensing_info_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from unittest import TestCase
 
 import pytest
diff --git a/tests/spdx/parser/jsonlikedict/test_file_parser.py b/tests/spdx/parser/jsonlikedict/test_file_parser.py
index 3cf41e6e5..b784d096a 100644
--- a/tests/spdx/parser/jsonlikedict/test_file_parser.py
+++ b/tests/spdx/parser/jsonlikedict/test_file_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from unittest import TestCase
 
 import pytest
diff --git a/tests/spdx/parser/jsonlikedict/test_license_expression_parser.py b/tests/spdx/parser/jsonlikedict/test_license_expression_parser.py
index 8157afcdf..2bb9a7899 100644
--- a/tests/spdx/parser/jsonlikedict/test_license_expression_parser.py
+++ b/tests/spdx/parser/jsonlikedict/test_license_expression_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from unittest import TestCase
 
 import pytest
diff --git a/tests/spdx/parser/jsonlikedict/test_package_parser.py b/tests/spdx/parser/jsonlikedict/test_package_parser.py
index e4d6c9028..d2b41ffde 100644
--- a/tests/spdx/parser/jsonlikedict/test_package_parser.py
+++ b/tests/spdx/parser/jsonlikedict/test_package_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from datetime import datetime
 from unittest import TestCase
 
diff --git a/tests/spdx/parser/jsonlikedict/test_relationship_parser.py b/tests/spdx/parser/jsonlikedict/test_relationship_parser.py
index 01f67833a..464c39f02 100644
--- a/tests/spdx/parser/jsonlikedict/test_relationship_parser.py
+++ b/tests/spdx/parser/jsonlikedict/test_relationship_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from unittest import TestCase
 
 import pytest
diff --git a/tests/spdx/parser/jsonlikedict/test_snippet_parser.py b/tests/spdx/parser/jsonlikedict/test_snippet_parser.py
index f2b8909b0..cdf96de14 100644
--- a/tests/spdx/parser/jsonlikedict/test_snippet_parser.py
+++ b/tests/spdx/parser/jsonlikedict/test_snippet_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from unittest import TestCase
 
 import pytest
diff --git a/tests/spdx/parser/rdf/test_annotation_parser.py b/tests/spdx/parser/rdf/test_annotation_parser.py
index d0b6068c2..de8a956bb 100644
--- a/tests/spdx/parser/rdf/test_annotation_parser.py
+++ b/tests/spdx/parser/rdf/test_annotation_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import os
 from datetime import datetime
 
diff --git a/tests/spdx/parser/rdf/test_checksum_parser.py b/tests/spdx/parser/rdf/test_checksum_parser.py
index 2597fd83f..add7e4155 100644
--- a/tests/spdx/parser/rdf/test_checksum_parser.py
+++ b/tests/spdx/parser/rdf/test_checksum_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import os
 
 import pytest
diff --git a/tests/spdx/parser/rdf/test_creation_info_parser.py b/tests/spdx/parser/rdf/test_creation_info_parser.py
index ba5cd19c2..696dd7c06 100644
--- a/tests/spdx/parser/rdf/test_creation_info_parser.py
+++ b/tests/spdx/parser/rdf/test_creation_info_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import os
 from datetime import datetime
 from typing import List, Tuple
diff --git a/tests/spdx/parser/rdf/test_extracted_licensing_info_parser.py b/tests/spdx/parser/rdf/test_extracted_licensing_info_parser.py
index db09dd0ff..46eacfe96 100644
--- a/tests/spdx/parser/rdf/test_extracted_licensing_info_parser.py
+++ b/tests/spdx/parser/rdf/test_extracted_licensing_info_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import os
 
 from rdflib import RDF, Graph
diff --git a/tests/spdx/parser/rdf/test_file_parser.py b/tests/spdx/parser/rdf/test_file_parser.py
index 33d168b4b..acc40aea4 100644
--- a/tests/spdx/parser/rdf/test_file_parser.py
+++ b/tests/spdx/parser/rdf/test_file_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import os
 from unittest import TestCase
 
diff --git a/tests/spdx/parser/rdf/test_graph_parsing_function.py b/tests/spdx/parser/rdf/test_graph_parsing_function.py
index 5a1118c2a..db9fa1d69 100644
--- a/tests/spdx/parser/rdf/test_graph_parsing_function.py
+++ b/tests/spdx/parser/rdf/test_graph_parsing_function.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import pytest
 from rdflib import Graph, Namespace, URIRef
 
diff --git a/tests/spdx/parser/rdf/test_license_expression_parser.py b/tests/spdx/parser/rdf/test_license_expression_parser.py
index 3a529e768..6124d3bfe 100644
--- a/tests/spdx/parser/rdf/test_license_expression_parser.py
+++ b/tests/spdx/parser/rdf/test_license_expression_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import os
 from unittest import TestCase
 
diff --git a/tests/spdx/parser/rdf/test_package_parser.py b/tests/spdx/parser/rdf/test_package_parser.py
index 454a37a79..2410c15d9 100644
--- a/tests/spdx/parser/rdf/test_package_parser.py
+++ b/tests/spdx/parser/rdf/test_package_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import os
 from unittest import TestCase
 
diff --git a/tests/spdx/parser/rdf/test_rdf_parser.py b/tests/spdx/parser/rdf/test_rdf_parser.py
index b80fe3581..754c9ae1f 100644
--- a/tests/spdx/parser/rdf/test_rdf_parser.py
+++ b/tests/spdx/parser/rdf/test_rdf_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import os
 
 import pytest
diff --git a/tests/spdx/parser/rdf/test_relationship_parser.py b/tests/spdx/parser/rdf/test_relationship_parser.py
index e96fee535..e3a7ae2ed 100644
--- a/tests/spdx/parser/rdf/test_relationship_parser.py
+++ b/tests/spdx/parser/rdf/test_relationship_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import os
 
 from rdflib import RDF, Graph
diff --git a/tests/spdx/parser/rdf/test_snippet_parser.py b/tests/spdx/parser/rdf/test_snippet_parser.py
index b98d8e9c7..2f33d22b1 100644
--- a/tests/spdx/parser/rdf/test_snippet_parser.py
+++ b/tests/spdx/parser/rdf/test_snippet_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import os
 from unittest import TestCase
 
diff --git a/tests/spdx/parser/tagvalue/test_annotation_parser.py b/tests/spdx/parser/tagvalue/test_annotation_parser.py
index 1fbd2060c..91bf81497 100644
--- a/tests/spdx/parser/tagvalue/test_annotation_parser.py
+++ b/tests/spdx/parser/tagvalue/test_annotation_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from datetime import datetime
 
 import pytest
diff --git a/tests/spdx/parser/tagvalue/test_creation_info_parser.py b/tests/spdx/parser/tagvalue/test_creation_info_parser.py
index 631aa3883..bab2e5e11 100644
--- a/tests/spdx/parser/tagvalue/test_creation_info_parser.py
+++ b/tests/spdx/parser/tagvalue/test_creation_info_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from datetime import datetime
 from unittest import TestCase
 
diff --git a/tests/spdx/parser/tagvalue/test_extracted_licensing_info_parser.py b/tests/spdx/parser/tagvalue/test_extracted_licensing_info_parser.py
index f97bff015..617ecbae5 100644
--- a/tests/spdx/parser/tagvalue/test_extracted_licensing_info_parser.py
+++ b/tests/spdx/parser/tagvalue/test_extracted_licensing_info_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from unittest import TestCase
 
 import pytest
diff --git a/tests/spdx/parser/tagvalue/test_file_parser.py b/tests/spdx/parser/tagvalue/test_file_parser.py
index ac6148bcd..eeffaf6dd 100644
--- a/tests/spdx/parser/tagvalue/test_file_parser.py
+++ b/tests/spdx/parser/tagvalue/test_file_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import pytest
 from license_expression import get_spdx_licensing
 
diff --git a/tests/spdx/parser/tagvalue/test_helper_methods.py b/tests/spdx/parser/tagvalue/test_helper_methods.py
index 828083836..9d384e8f7 100644
--- a/tests/spdx/parser/tagvalue/test_helper_methods.py
+++ b/tests/spdx/parser/tagvalue/test_helper_methods.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import pytest
 
 from spdx.model.checksum import ChecksumAlgorithm
diff --git a/tests/spdx/parser/tagvalue/test_package_parser.py b/tests/spdx/parser/tagvalue/test_package_parser.py
index f5c75d751..fd4518b3d 100644
--- a/tests/spdx/parser/tagvalue/test_package_parser.py
+++ b/tests/spdx/parser/tagvalue/test_package_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from datetime import datetime
 from unittest import TestCase
 
diff --git a/tests/spdx/parser/tagvalue/test_relationship_parser.py b/tests/spdx/parser/tagvalue/test_relationship_parser.py
index fc74b05b7..857166ed5 100644
--- a/tests/spdx/parser/tagvalue/test_relationship_parser.py
+++ b/tests/spdx/parser/tagvalue/test_relationship_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import pytest
 
 from spdx.model.relationship import Relationship, RelationshipType
diff --git a/tests/spdx/parser/tagvalue/test_snippet_parser.py b/tests/spdx/parser/tagvalue/test_snippet_parser.py
index 4e563a581..271ebead9 100644
--- a/tests/spdx/parser/tagvalue/test_snippet_parser.py
+++ b/tests/spdx/parser/tagvalue/test_snippet_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from unittest import TestCase
 
 import pytest
diff --git a/tests/spdx/parser/tagvalue/test_tag_value_lexer.py b/tests/spdx/parser/tagvalue/test_tag_value_lexer.py
index 2a8bb670b..6792316fd 100644
--- a/tests/spdx/parser/tagvalue/test_tag_value_lexer.py
+++ b/tests/spdx/parser/tagvalue/test_tag_value_lexer.py
@@ -1,14 +1,7 @@
 # Copyright (c) 2014 Ahmed H. Ismail
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import pytest
 
 from spdx.parser.tagvalue.lexer import SPDXLexer
diff --git a/tests/spdx/parser/tagvalue/test_tag_value_parser.py b/tests/spdx/parser/tagvalue/test_tag_value_parser.py
index 1cd0183e0..d9c50c901 100644
--- a/tests/spdx/parser/tagvalue/test_tag_value_parser.py
+++ b/tests/spdx/parser/tagvalue/test_tag_value_parser.py
@@ -1,14 +1,7 @@
 # Copyright (c) 2014 Ahmed H. Ismail
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import os
 
 import pytest
diff --git a/tests/spdx/test_actor_parser.py b/tests/spdx/test_actor_parser.py
index dfd43a172..0dfe56081 100644
--- a/tests/spdx/test_actor_parser.py
+++ b/tests/spdx/test_actor_parser.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from unittest import TestCase
 
 import pytest
diff --git a/tests/spdx/test_casing_tools.py b/tests/spdx/test_casing_tools.py
index 354cb7657..77c19f977 100644
--- a/tests/spdx/test_casing_tools.py
+++ b/tests/spdx/test_casing_tools.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import pytest
 
 from spdx.casing_tools import camel_case_to_snake_case, snake_case_to_camel_case
diff --git a/tests/spdx/test_datetime_conversions.py b/tests/spdx/test_datetime_conversions.py
index b396edf13..db1df249e 100644
--- a/tests/spdx/test_datetime_conversions.py
+++ b/tests/spdx/test_datetime_conversions.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from datetime import datetime
 
 import pytest
diff --git a/tests/spdx/validation/test_actor_validator.py b/tests/spdx/validation/test_actor_validator.py
index 19a99b8c7..78227da70 100644
--- a/tests/spdx/validation/test_actor_validator.py
+++ b/tests/spdx/validation/test_actor_validator.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 from typing import List
 
diff --git a/tests/spdx/validation/test_annotation_validator.py b/tests/spdx/validation/test_annotation_validator.py
index aba5995d5..d04c7d1c2 100644
--- a/tests/spdx/validation/test_annotation_validator.py
+++ b/tests/spdx/validation/test_annotation_validator.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 from typing import List
 
diff --git a/tests/spdx/validation/test_checksum_validator.py b/tests/spdx/validation/test_checksum_validator.py
index 7f4ae51d5..6217f859a 100644
--- a/tests/spdx/validation/test_checksum_validator.py
+++ b/tests/spdx/validation/test_checksum_validator.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 from typing import List
 
diff --git a/tests/spdx/validation/test_creation_info_validator.py b/tests/spdx/validation/test_creation_info_validator.py
index b278e2f0c..a67ca5c45 100644
--- a/tests/spdx/validation/test_creation_info_validator.py
+++ b/tests/spdx/validation/test_creation_info_validator.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 from typing import List
 
diff --git a/tests/spdx/validation/test_document_validator.py b/tests/spdx/validation/test_document_validator.py
index d26258b63..d242a52c6 100644
--- a/tests/spdx/validation/test_document_validator.py
+++ b/tests/spdx/validation/test_document_validator.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 from typing import List, Optional
 
diff --git a/tests/spdx/validation/test_external_document_ref_validator.py b/tests/spdx/validation/test_external_document_ref_validator.py
index 4ad65edf4..8402c070d 100644
--- a/tests/spdx/validation/test_external_document_ref_validator.py
+++ b/tests/spdx/validation/test_external_document_ref_validator.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 from typing import List
 
diff --git a/tests/spdx/validation/test_external_package_ref_validator.py b/tests/spdx/validation/test_external_package_ref_validator.py
index b3dfa48d8..2e509c603 100644
--- a/tests/spdx/validation/test_external_package_ref_validator.py
+++ b/tests/spdx/validation/test_external_package_ref_validator.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 from typing import List
 
diff --git a/tests/spdx/validation/test_extracted_licensing_info_validator.py b/tests/spdx/validation/test_extracted_licensing_info_validator.py
index ce82f0626..19fb0875f 100644
--- a/tests/spdx/validation/test_extracted_licensing_info_validator.py
+++ b/tests/spdx/validation/test_extracted_licensing_info_validator.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 from typing import List
 
diff --git a/tests/spdx/validation/test_file_validator.py b/tests/spdx/validation/test_file_validator.py
index e215d56c9..210b23987 100644
--- a/tests/spdx/validation/test_file_validator.py
+++ b/tests/spdx/validation/test_file_validator.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 from typing import List
 from unittest import TestCase
diff --git a/tests/spdx/validation/test_license_expression_validator.py b/tests/spdx/validation/test_license_expression_validator.py
index 4a81ec525..48cb1f31a 100644
--- a/tests/spdx/validation/test_license_expression_validator.py
+++ b/tests/spdx/validation/test_license_expression_validator.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 from typing import List
 from unittest import TestCase
diff --git a/tests/spdx/validation/test_package_validator.py b/tests/spdx/validation/test_package_validator.py
index 24ecd6160..aeee350c9 100644
--- a/tests/spdx/validation/test_package_validator.py
+++ b/tests/spdx/validation/test_package_validator.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 from typing import List
 from unittest import TestCase
diff --git a/tests/spdx/validation/test_package_verification_code_validator.py b/tests/spdx/validation/test_package_verification_code_validator.py
index d6ddb1548..ca59c074a 100644
--- a/tests/spdx/validation/test_package_verification_code_validator.py
+++ b/tests/spdx/validation/test_package_verification_code_validator.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 import pytest
 
diff --git a/tests/spdx/validation/test_relationship_validator.py b/tests/spdx/validation/test_relationship_validator.py
index 83e8bc1a6..a208be609 100644
--- a/tests/spdx/validation/test_relationship_validator.py
+++ b/tests/spdx/validation/test_relationship_validator.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 from typing import List
 
diff --git a/tests/spdx/validation/test_snippet_validator.py b/tests/spdx/validation/test_snippet_validator.py
index 5c9881653..8b25d01ee 100644
--- a/tests/spdx/validation/test_snippet_validator.py
+++ b/tests/spdx/validation/test_snippet_validator.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 from typing import List
 from unittest import TestCase
diff --git a/tests/spdx/validation/test_spdx_id_validators.py b/tests/spdx/validation/test_spdx_id_validators.py
index e29697862..a32e46acd 100644
--- a/tests/spdx/validation/test_spdx_id_validators.py
+++ b/tests/spdx/validation/test_spdx_id_validators.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from unittest import TestCase
 
 import pytest
diff --git a/tests/spdx/validation/test_uri_validators.py b/tests/spdx/validation/test_uri_validators.py
index 59a8dd1e5..119be756a 100644
--- a/tests/spdx/validation/test_uri_validators.py
+++ b/tests/spdx/validation/test_uri_validators.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 
 import pytest
 
diff --git a/tests/spdx/writer/json/test_json_writer.py b/tests/spdx/writer/json/test_json_writer.py
index aff0c9501..432498abd 100644
--- a/tests/spdx/writer/json/test_json_writer.py
+++ b/tests/spdx/writer/json/test_json_writer.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2022 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2022 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import json
 import os
 
diff --git a/tests/spdx/writer/rdf/test_annotation_writer.py b/tests/spdx/writer/rdf/test_annotation_writer.py
index 1e616ac6a..6ac4e2f15 100644
--- a/tests/spdx/writer/rdf/test_annotation_writer.py
+++ b/tests/spdx/writer/rdf/test_annotation_writer.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from rdflib import RDF, RDFS, Graph, Literal, URIRef
 
 from spdx.datetime_conversions import datetime_to_iso_string
diff --git a/tests/spdx/writer/rdf/test_checksum_writer.py b/tests/spdx/writer/rdf/test_checksum_writer.py
index 76560e8e4..38451242c 100644
--- a/tests/spdx/writer/rdf/test_checksum_writer.py
+++ b/tests/spdx/writer/rdf/test_checksum_writer.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import pytest
 from rdflib import RDF, Graph, Literal, URIRef
 
diff --git a/tests/spdx/writer/rdf/test_creation_info_writer.py b/tests/spdx/writer/rdf/test_creation_info_writer.py
index 0a3e5155a..310903677 100644
--- a/tests/spdx/writer/rdf/test_creation_info_writer.py
+++ b/tests/spdx/writer/rdf/test_creation_info_writer.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from rdflib import RDF, RDFS, Graph, Literal, URIRef
 
 from spdx.datetime_conversions import datetime_to_iso_string
diff --git a/tests/spdx/writer/rdf/test_external_document_ref_writer.py b/tests/spdx/writer/rdf/test_external_document_ref_writer.py
index 6e6acf8f7..6a8ddc4e7 100644
--- a/tests/spdx/writer/rdf/test_external_document_ref_writer.py
+++ b/tests/spdx/writer/rdf/test_external_document_ref_writer.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from rdflib import RDF, Graph, URIRef
 
 from spdx.rdfschema.namespace import SPDX_NAMESPACE
diff --git a/tests/spdx/writer/rdf/test_extracted_licensing_info_writer.py b/tests/spdx/writer/rdf/test_extracted_licensing_info_writer.py
index 3019d62ac..0dd2df95c 100644
--- a/tests/spdx/writer/rdf/test_extracted_licensing_info_writer.py
+++ b/tests/spdx/writer/rdf/test_extracted_licensing_info_writer.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from rdflib import RDF, RDFS, Graph, Literal, URIRef
 
 from spdx.rdfschema.namespace import SPDX_NAMESPACE
diff --git a/tests/spdx/writer/rdf/test_file_writer.py b/tests/spdx/writer/rdf/test_file_writer.py
index d28a1c9b8..17092c457 100644
--- a/tests/spdx/writer/rdf/test_file_writer.py
+++ b/tests/spdx/writer/rdf/test_file_writer.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from rdflib import RDF, RDFS, Graph, Literal, URIRef
 
 from spdx.rdfschema.namespace import LICENSE_NAMESPACE, SPDX_NAMESPACE
diff --git a/tests/spdx/writer/rdf/test_license_expression_writer.py b/tests/spdx/writer/rdf/test_license_expression_writer.py
index 73152ee69..f90022cb1 100644
--- a/tests/spdx/writer/rdf/test_license_expression_writer.py
+++ b/tests/spdx/writer/rdf/test_license_expression_writer.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import pytest
 from license_expression import get_spdx_licensing
 from rdflib import RDF, Graph, Literal, URIRef
diff --git a/tests/spdx/writer/rdf/test_package_writer.py b/tests/spdx/writer/rdf/test_package_writer.py
index bab01ff53..6fd86351b 100644
--- a/tests/spdx/writer/rdf/test_package_writer.py
+++ b/tests/spdx/writer/rdf/test_package_writer.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import pytest
 from rdflib import DOAP, RDF, RDFS, XSD, Graph, Literal, URIRef
 
diff --git a/tests/spdx/writer/rdf/test_rdf_writer.py b/tests/spdx/writer/rdf/test_rdf_writer.py
index 3d99c2389..d3fb42380 100644
--- a/tests/spdx/writer/rdf/test_rdf_writer.py
+++ b/tests/spdx/writer/rdf/test_rdf_writer.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import os
 
 import pytest
diff --git a/tests/spdx/writer/rdf/test_relationship_writer.py b/tests/spdx/writer/rdf/test_relationship_writer.py
index dc559caf0..3c208b7c3 100644
--- a/tests/spdx/writer/rdf/test_relationship_writer.py
+++ b/tests/spdx/writer/rdf/test_relationship_writer.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 from rdflib import RDFS, Graph, Literal, URIRef
 
 from spdx.rdfschema.namespace import SPDX_NAMESPACE
diff --git a/tests/spdx/writer/rdf/test_snippet_writer.py b/tests/spdx/writer/rdf/test_snippet_writer.py
index 53c493ded..9f6343876 100644
--- a/tests/spdx/writer/rdf/test_snippet_writer.py
+++ b/tests/spdx/writer/rdf/test_snippet_writer.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import pytest
 from rdflib import RDF, RDFS, Graph, Literal, URIRef
 
diff --git a/tests/spdx/writer/rdf/test_writer_utils.py b/tests/spdx/writer/rdf/test_writer_utils.py
index aa74c570f..dd9978b3f 100644
--- a/tests/spdx/writer/rdf/test_writer_utils.py
+++ b/tests/spdx/writer/rdf/test_writer_utils.py
@@ -1,13 +1,6 @@
-# Copyright (c) 2023 spdx contributors
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#     http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2023 spdx contributors
+
+# SPDX-License-Identifier: Apache-2.0
 import pytest
 
 from spdx.writer.rdf.writer_utils import add_namespace_to_spdx_id