diff --git a/SOL005/VNFSnapshotPackageManagement-API/IndividualVNFSnapshotPackageArtifact.robot b/SOL005/VNFSnapshotPackageManagement-API/IndividualVNFSnapshotPackageArtifact.robot
index c0241349a1fef9164c45c10c3e7fc61d0b66bfc9..37db5643f1a46e6585ba40c373753bea03dfc82e 100644
--- a/SOL005/VNFSnapshotPackageManagement-API/IndividualVNFSnapshotPackageArtifact.robot
+++ b/SOL005/VNFSnapshotPackageManagement-API/IndividualVNFSnapshotPackageArtifact.robot
@@ -40,6 +40,7 @@ GET Individual VNF Snapshot Package Artifact - Partial Content
     Check HTTP Response Status Code Is    206
     Check HTTP Content-Type Header Is Set For Package Artifact
     Check HTTP Content-Range Header Is Set
+    Check HTTP Content-Length Header Is Set
     
 GET Individual VNF Snapshot Package Artifact - Range Request Not Supported
     [Documentation]    Test ID: 5.3.7.10.4
diff --git a/SOL005/VNFSnapshotPackageManagement-API/VNFSnapshotPackageContent.robot b/SOL005/VNFSnapshotPackageManagement-API/VNFSnapshotPackageContent.robot
index 14b7382742006e6daebeae987031429f56025f4e..bf1a14008d485912828928411b97173ca56149db 100644
--- a/SOL005/VNFSnapshotPackageManagement-API/VNFSnapshotPackageContent.robot
+++ b/SOL005/VNFSnapshotPackageManagement-API/VNFSnapshotPackageContent.robot
@@ -40,6 +40,7 @@ GET VNF Snapshot Package Content - Partial Content
     Check HTTP Response Status Code Is    206
     Check HTTP Content-Type Header Is Set For Package Content
     Check HTTP Content-Range Header Is Set
+    Check HTTP Content-Length Header Is Set
     
 GET VNF Snapshot Package Content - Range Request Not Supported
     [Documentation]    Test ID: 5.3.7.4.4
diff --git a/SOL005/VNFSnapshotPackageManagement-API/VnfSnapshotPackageManagementKeywords.robot b/SOL005/VNFSnapshotPackageManagement-API/VnfSnapshotPackageManagementKeywords.robot
index 3c5a616bce54d9593b020232faa4f90eb5d9bee5..fd2074090bb0f703c9ab45565e6cf0a744737641 100644
--- a/SOL005/VNFSnapshotPackageManagement-API/VnfSnapshotPackageManagementKeywords.robot
+++ b/SOL005/VNFSnapshotPackageManagement-API/VnfSnapshotPackageManagementKeywords.robot
@@ -358,8 +358,14 @@ Check HTTP Content-Type Header Is Set For Package Content
 Check HTTP Content-Range Header Is Set
     Log    Check Content-Range HTTP Header
     Should Contain    ${response['headers']}    Content-Range
-    Should Be Equal As Strings    ${response['headers']['Content-Range']}    ${range}
+    Should Be Equal As Strings    ${response['headers']['Content-Range']}    ${range}/${full_length}
     Log    Header Content-Range is present
+    
+Check HTTP Content-Length Header Is Set
+    Log    Check Content-Length HTTP Header
+    Should Contain    ${response['headers']}    Content-Lenght
+    Should Be Equal As Strings    ${response['headers']['Content-Length']}    ${full_length}
+    Log    Header Content-Length is present
 
 PUT VNF Snapshot Package Content
     log    Trying to upload the contents of VNF Snapshot Package using PUT
diff --git a/SOL005/VNFSnapshotPackageManagement-API/environment/variables.txt b/SOL005/VNFSnapshotPackageManagement-API/environment/variables.txt
index 3bdb6092b37bdaa077b5f9e4e4823e99b4ab70df..ea521e2b44e0a269bdcfb4520c0e1fc2b453811c 100644
--- a/SOL005/VNFSnapshotPackageManagement-API/environment/variables.txt
+++ b/SOL005/VNFSnapshotPackageManagement-API/environment/variables.txt
@@ -78,7 +78,7 @@ ${ext_artifactPath}    artifactPath/external
 ${CONTENT_TYPE_OCTET}    application/octet-stream
 ${NFVO_RANGE_OK}    1    # If 1 means that Range is supported by the NFVO
 ${range}          bytes=0-1023
-${full_size}        2000            # Size of the requested artifact to be downloaded via partial downloads
+${full_length}        2000            # Size of the requested artifact to be downloaded via partial downloads
 ${erroneousRange}    bytes=10000000-1000000000    # Requesting a out of range number of bytes
 ${vnfPackageOctetStreamId}    octetStreamPkgId
 ${vnfdOctetStreamId}    octetStreamVnfdId