diff --git a/test/test.js b/test/test.js
index 368d3a7..09e672e 100644
--- a/test/test.js
+++ b/test/test.js
@@ -46,7 +46,7 @@ describe('Application life cycle test', function () {
 
     var LOCATION = 'test';
     var TEST_TIMEOUT = 30000;
-    var FOLDER = 'outerspace';
+    var FOLDER = 'xmf'; // keep this small. long folder names fail in automation, not sure why
     var SYNC_PORT = 22001;
     var app;
 
@@ -89,12 +89,18 @@ describe('Application life cycle test', function () {
             return browser.findElement(by.css('[ng-click*=addFolder]')).click();
         }).then(function () {
             return visible(by.id('folderPath'));
+        }).then(function () {
+            return browser.sleep(4000); // wait more, not sure why this is needed
         }).then(function() {
             return browser.findElement(by.id('folderLabel')).sendKeys(FOLDER);
+        }).then(function () {
+            return browser.sleep(4000); // without this sometimes only part of the folder name gets through
         }).then(function() {
             return browser.findElement(by.css('[ng-click*=saveFolder]')).click();
         }).then(function() {
             return browser.wait(until.elementLocated(by.css('#folders .panel-status span[ng-switch-when=unshared]')), TEST_TIMEOUT);
+        }).then(function () {
+            return browser.sleep(4000);
         }).then(function() {
             callback();
         });