diff --git a/lib/cli/resources/content/favorite_file.jpg b/lib/cli/resources/content/e2e_favorite_file.jpg
similarity index 100%
rename from lib/cli/resources/content/favorite_file.jpg
rename to lib/cli/resources/content/e2e_favorite_file.jpg
diff --git a/lib/cli/resources/content/lock.png b/lib/cli/resources/content/e2e_lock.png
similarity index 100%
rename from lib/cli/resources/content/lock.png
rename to lib/cli/resources/content/e2e_lock.png
diff --git a/lib/cli/resources/content/second_lock.png b/lib/cli/resources/content/e2e_second_lock.png
similarity index 100%
rename from lib/cli/resources/content/second_lock.png
rename to lib/cli/resources/content/e2e_second_lock.png
diff --git a/lib/cli/resources/content/share_file.jpg b/lib/cli/resources/content/e2e_share_file.jpg
similarity index 100%
rename from lib/cli/resources/content/share_file.jpg
rename to lib/cli/resources/content/e2e_share_file.jpg
diff --git a/lib/cli/resources/content/share_profile_pic.jpg b/lib/cli/resources/content/e2e_share_profile_pic.jpg
similarity index 100%
rename from lib/cli/resources/content/share_profile_pic.jpg
rename to lib/cli/resources/content/e2e_share_profile_pic.jpg
diff --git a/lib/cli/resources/content/share_profile_pic.png b/lib/cli/resources/content/e2e_share_profile_pic.png
similarity index 100%
rename from lib/cli/resources/content/share_profile_pic.png
rename to lib/cli/resources/content/e2e_share_profile_pic.png
diff --git a/lib/cli/resources/content/to_be_deleted.png b/lib/cli/resources/content/e2e_to_be_deleted.png
similarity index 100%
rename from lib/cli/resources/content/to_be_deleted.png
rename to lib/cli/resources/content/e2e_to_be_deleted.png
diff --git a/lib/cli/scripts/init-acs-env.ts b/lib/cli/scripts/init-acs-env.ts
index 669248bcaa..6d4e138b51 100755
--- a/lib/cli/scripts/init-acs-env.ts
+++ b/lib/cli/scripts/init-acs-env.ts
@@ -4,7 +4,7 @@ let program = require('commander');
 let fs = require ('fs');
 const path = require('path');
 import { logger } from './logger';
-const { SharedlinksApi, FavoritesApi } = require('@alfresco/js-api');
+const { SharedlinksApi, FavoritesApi, NodesApi } = require('@alfresco/js-api');
 let MAX_RETRY = 10;
 let counter = 0;
 let TIMEOUT = 6000;
@@ -34,32 +34,55 @@ async function main() {
 }
 
 async function initializeDefaultFiles() {
+    const e2eFolder = ACS_DEFAULT.e2eFolder;
+    const parentFolder = await createFolder(e2eFolder.name, '-my-');
+    const parentFolderId = parentFolder.entry.id;
+
     for (let j = 0; j < ACS_DEFAULT.files.length; j++) {
         const fileInfo = ACS_DEFAULT.files[j];
         switch (fileInfo.action) {
             case 'UPLOAD':
-                await uploadFile(fileInfo.name, fileInfo.destination);
+                await uploadFile(fileInfo.name, parentFolderId);
                 break;
             case 'LOCK':
-                const fileToLock = await uploadFile(fileInfo.name, fileInfo.destination);
+                const fileToLock = await uploadFile(fileInfo.name, parentFolderId);
                 await lockFile(fileToLock.entry.id);
                 break;
             case 'SHARE':
-                const fileToShare = await uploadFile(fileInfo.name, fileInfo.destination);
+                const fileToShare = await uploadFile(fileInfo.name, parentFolderId);
                 await shareFile(fileToShare.entry.id);
                 break;
             case 'FAVORITE':
-                const fileToFav = await uploadFile(fileInfo.name, fileInfo.destination);
+                const fileToFav = await uploadFile(fileInfo.name, parentFolderId);
                 await favoriteFile(fileToFav.entry.id);
                 break;
             default:
-                logger.error('No action found for file ', fileInfo.name);
+                logger.error('No action found for file ', fileInfo.name, parentFolderId);
                 break;
         }
     }
 }
 
-async function uploadFile(fileName, fileDestination) {
+async function createFolder(folderName: string, parentId: string) {
+        let createdFolder: any;
+        const body = {
+            name: folderName,
+            nodeType: 'cm:folder'
+        };
+        try {
+            createdFolder = await new NodesApi(alfrescoJsApi).createNode(parentId, body, {overwrite: true});
+
+            logger.info(`Folder ${folderName} was created`);
+        } catch (err) {
+            if (err.status === 409) {
+                const relativePath = `/${folderName}`;
+                createdFolder = await new NodesApi(alfrescoJsApi).getNode('-my-', { relativePath });
+             }
+        }
+        return createdFolder;
+}
+
+async function uploadFile(fileName: string, fileDestination: string) {
     const filePath = `../resources/content/${fileName}`;
     const file = fs.createReadStream(path.join(__dirname, filePath));
     let uploadedFile: any;
diff --git a/lib/cli/scripts/resources.ts b/lib/cli/scripts/resources.ts
index 9f9445f9ac..f8aecc633a 100644
--- a/lib/cli/scripts/resources.ts
+++ b/lib/cli/scripts/resources.ts
@@ -209,37 +209,43 @@ export const ACTIVITI_APPS: any = {
         }
     ]
 };
+
 export const ACS_DEFAULT: any = {
     files : [
         {
-            name: 'share_profile_pic.png',
+            name: 'e2e_share_profile_pic.png',
             destination: '-my-',
             action: 'UPLOAD'
         },
         {
-            name: 'share_profile_pic.jpg',
+            name: 'e2e_share_profile_pic.jpg',
             destination: '-my-',
             action: 'UPLOAD'
         },
         {
-            name: 'lock.png',
+            name: 'e2e_lock.png',
             destination: '-my-',
             action: 'LOCK'
         },
         {
-            name: 'second_lock.png',
+            name: 'e2e_second_lock.png',
             destination: '-my-',
             action: 'LOCK'
         },
         {
-            name: 'share_file.jpg',
+            name: 'e2e_share_file.jpg',
             destination: '-my-',
             action: 'SHARE'
         },
         {
-            name: 'favorite_file.jpg',
+            name: 'e2e_favorite_file.jpg',
             destination: '-my-',
             action: 'FAVORITE'
         }
-    ]
+    ],
+
+    e2eFolder:
+        {
+            name: 'e2e-test-data'
+        }
 };