diff --git a/robot-systest/resources/basic_12-ns_primitives_data.py b/robot-systest/resources/basic_12-ns_primitives_data.py
index 7a91f2e..1b92b5a 100644
--- a/robot-systest/resources/basic_12-ns_primitives_data.py
+++ b/robot-systest/resources/basic_12-ns_primitives_data.py
@@ -20,6 +20,7 @@
 vnfd_pkg1 = 'nscharm_policy_vnf'
 vnfd_pkg2 = 'nscharm_user_vnf'
 nsd_pkg = 'nscharm_ns'
+new_nsd_pkg = 'new_nscharm_ns'
 # NSD and VNFD names in OSM
 vnfd_name1 = 'nscharm-policy-vnf'
 vnfd_name2 = 'nscharm-user-vnf'
diff --git a/robot-systest/testsuite/basic_12-ns_primitives.robot b/robot-systest/testsuite/basic_12-ns_primitives.robot
index e4113e7..6b94d3a 100644
--- a/robot-systest/testsuite/basic_12-ns_primitives.robot
+++ b/robot-systest/testsuite/basic_12-ns_primitives.robot
@@ -34,15 +34,18 @@
 *** Variables ***
 ${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
 ${publickey}   ${EMPTY}
+${success_return_code}   0
+
 
 *** Test Cases ***
 Change Juju Password
-
     [Documentation]  NS package needs to be updated with the Juju credentials for your OSM installation
 
-    ${nsd_yaml}=   Get File  %{PACKAGES_FOLDER}/${nsd_pkg}/${nsd_file}
+    ${rc}   ${stdout}=   Run and Return RC and Output   cp -r '%{PACKAGES_FOLDER}/${nsd_pkg}' '%{PACKAGES_FOLDER}/${new_nsd_pkg}'
+    Should Be Equal As Integers   ${rc}   ${success_return_code}
+    ${nsd_yaml}=   Get File  %{PACKAGES_FOLDER}/${new_nsd_pkg}/${nsd_file}
     ${changed_nsd_yaml}=   Replace String  ${nsd_yaml}  ${old_juju_password}  %{JUJU_PASSWORD}
-    Create File  %{PACKAGES_FOLDER}/${nsd_pkg}/${nsd_file}  ${changed_nsd_yaml}
+    Create File  %{PACKAGES_FOLDER}/${new_nsd_pkg}/${nsd_file}  ${changed_nsd_yaml}
 
 Upload Vnfds
 
@@ -51,7 +54,7 @@
 
 Upload Nsd
 
-    Create NSD  %{PACKAGES_FOLDER}/${nsd_pkg}/
+    Create NSD  %{PACKAGES_FOLDER}/${new_nsd_pkg}/
 
 Instantiate NS
 
@@ -61,19 +64,17 @@
 # TODO: Check Initial Config Primitives Status
 
 Delete NS 
-
     [Tags]   cleanup
 
     Delete NS   ${ns_name}
 
 Delete NS Descriptor
-
     [Tags]   cleanup
 
     Delete NSD   ${nsd_name}
+    Delete Temporary Descriptor Folder  '%{PACKAGES_FOLDER}/${new_nsd_pkg}'
 
 Delete VNF Descriptors
-
     [Tags]   cleanup
 
     Delete VNFD   ${vnfd_name1}
@@ -88,3 +89,14 @@
     Run Keyword If Any Tests Failed  Delete NSD   ${nsd_name}
     Run Keyword If Any Tests Failed  Delete VNFD   ${vnfd_name1}
     Run Keyword If Any Tests Failed  Delete VNFD   ${vnfd_name2}
+    Delete Temporary Descriptor Folder  '%{PACKAGES_FOLDER}/${new_nsd_pkg}'
+
+
+Delete Temporary Descriptor Folder
+    [Documentation]  Removes the temporary package folder created for the test
+    [Arguments]   ${folder_name}
+
+    ${rc}   ${stdout}=   Run and Return RC and Output   rm -rf '${folder_name}'
+    log   ${stdout}
+
+