diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/CreateFolderTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/CreateFolderTest.java
index cbef8ff3..6c8871b3 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/CreateFolderTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/CreateFolderTest.java
@@ -130,7 +130,7 @@ public class CreateFolderTest extends ActivityInstrumentationTestCase2<TestActiv
 		RemoteOperationResult removeResult = null;
 		while (it.hasNext()) {
 			removeResult = mActivity.removeFile(it.next());
-			if (!removeResult.isSuccess()) {
+			if (!removeResult.isSuccess() && removeResult.getCode() != ResultCode.TIMEOUT) {
 				Utils.logAndThrow(LOG_TAG, removeResult);
 			}
 		}
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/CreateShareTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/CreateShareTest.java
index bbf65f5f..6e1ba11c 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/CreateShareTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/CreateShareTest.java
@@ -27,6 +27,7 @@ package com.owncloud.android.lib.test_project.test;
 import java.io.File;
 
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.resources.shares.ShareType;
 import com.owncloud.android.lib.test_project.TestActivity;
 
@@ -80,7 +81,7 @@ public class CreateShareTest extends ActivityInstrumentationTestCase2<TestActivi
 	@Override
 	protected void tearDown() throws Exception {
 		RemoteOperationResult removeResult = mActivity.removeFile(FILE_TO_SHARE);
-		if (!removeResult.isSuccess()) {
+		if (!removeResult.isSuccess()  && removeResult.getCode() != ResultCode.TIMEOUT) {
 			Utils.logAndThrow(LOG_TAG, removeResult);
 		}
 		super.tearDown();
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/DeleteFileTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/DeleteFileTest.java
index b0bc19fe..c7493890 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/DeleteFileTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/DeleteFileTest.java
@@ -27,6 +27,7 @@ package com.owncloud.android.lib.test_project.test;
 import java.io.File;
 
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.test_project.TestActivity;
 
 import android.test.ActivityInstrumentationTestCase2;
@@ -66,7 +67,7 @@ public class DeleteFileTest extends ActivityInstrumentationTestCase2<TestActivit
 	    	
 			Log.v(LOG_TAG, "Starting global set up");
 			RemoteOperationResult result = mActivity.createFolder(FOLDER_PATH, true);
-			if (!result.isSuccess()) {
+			if (!result.isSuccess()  && result.getCode() != ResultCode.TIMEOUT) {
 				Utils.logAndThrow(LOG_TAG, result);
 			}
 			
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java
index ec347d8c..199bc128 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java
@@ -136,7 +136,7 @@ public class DownloadFileTest extends ActivityInstrumentationTestCase2<TestActiv
 	protected void tearDown() throws Exception {
 		if (mDownloadedFilePath != null) {
 			RemoteOperationResult removeResult = mActivity.removeFile(mDownloadedFilePath);
-			if (!removeResult.isSuccess()) {
+			if (!removeResult.isSuccess()  && removeResult.getCode() != ResultCode.TIMEOUT) {
 				Utils.logAndThrow(LOG_TAG, removeResult);
 			}
 		}
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetSharesTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetSharesTest.java
index 71ee3abc..1b8ba99b 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetSharesTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetSharesTest.java
@@ -27,6 +27,7 @@ package com.owncloud.android.lib.test_project.test;
 import java.io.File;
 
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.resources.shares.ShareType;
 import com.owncloud.android.lib.test_project.TestActivity;
 
@@ -68,7 +69,7 @@ public class GetSharesTest extends ActivityInstrumentationTestCase2<TestActivity
 		}
 		
 		result = mActivity.createShare(SHARED_FILE, ShareType.PUBLIC_LINK, "", false, "", 1);
-		if (!result.isSuccess()) {
+		if (!result.isSuccess()  && result.getCode() != ResultCode.TIMEOUT) {
 			Utils.logAndThrow(LOG_TAG, result);
 		}
 		
@@ -87,7 +88,7 @@ public class GetSharesTest extends ActivityInstrumentationTestCase2<TestActivity
 	@Override
 	protected void tearDown() throws Exception {
 		RemoteOperationResult removeResult = mActivity.removeFile(SHARED_FILE);
-		if (!removeResult.isSuccess()) {
+		if (!removeResult.isSuccess() && removeResult.getCode() != ResultCode.TIMEOUT) {
 			Utils.logAndThrow(LOG_TAG, removeResult);
 		}
 		super.tearDown();
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/MoveFileTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/MoveFileTest.java
index 8061e0db..75acb805 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/MoveFileTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/MoveFileTest.java
@@ -245,7 +245,7 @@ public class MoveFileTest extends ActivityInstrumentationTestCase2<TestActivity>
 	    RemoteOperationResult result = null;
 	    for (String folderPath : FOLDERS_IN_FIXTURE) {
 	    	result = TestActivity.createFolder(folderPath, true, mClient);
-			if (!result.isSuccess()) {
+			if (!result.isSuccess() && result.getCode() != ResultCode.TIMEOUT) {
 				Utils.logAndThrow(LOG_TAG, result);
 			}	    	
 	    }
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/ReadFileTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/ReadFileTest.java
index 8255cb7a..93dacd92 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/ReadFileTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/ReadFileTest.java
@@ -26,6 +26,7 @@ package com.owncloud.android.lib.test_project.test;
 import java.io.File;
 
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.test_project.TestActivity;
 
 import android.test.ActivityInstrumentationTestCase2;
@@ -78,7 +79,7 @@ public class ReadFileTest extends 	ActivityInstrumentationTestCase2<TestActivity
 	@Override
 	protected void tearDown() throws Exception {
 		RemoteOperationResult removeResult = mActivity.removeFile(FILE_PATH);
-		if (!removeResult.isSuccess()) {
+		if (!removeResult.isSuccess() && removeResult.getCode() != ResultCode.TIMEOUT) {
 			Utils.logAndThrow(LOG_TAG, removeResult);
 		}
 		
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/ReadFolderTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/ReadFolderTest.java
index 342f3ab4..3e04208e 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/ReadFolderTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/ReadFolderTest.java
@@ -27,6 +27,7 @@ package com.owncloud.android.lib.test_project.test;
 import java.io.File;
 
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.test_project.TestActivity;
 
 import android.test.ActivityInstrumentationTestCase2;
@@ -94,7 +95,7 @@ public class ReadFolderTest extends	ActivityInstrumentationTestCase2<TestActivit
 	@Override
 	protected void tearDown() throws Exception {
 		RemoteOperationResult removeResult = mActivity.removeFile(FOLDER_PATH);
-		if (!removeResult.isSuccess()) {
+		if (!removeResult.isSuccess() && removeResult.getCode() != ResultCode.TIMEOUT) {
 			Utils.logAndThrow(LOG_TAG, removeResult);
 		}
 		
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/RemoveShareTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/RemoveShareTest.java
index 10184516..2ea83a15 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/RemoveShareTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/RemoveShareTest.java
@@ -29,6 +29,7 @@ import java.io.File;
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.test_project.TestActivity;
 
 import android.test.ActivityInstrumentationTestCase2;
@@ -85,7 +86,7 @@ public class RemoveShareTest extends ActivityInstrumentationTestCase2<TestActivi
 	@Override
 	protected void tearDown() throws Exception {
 		RemoteOperationResult removeResult = mActivity.removeFile(FILE_TO_UNSHARE);
-		if (!removeResult.isSuccess()) {
+		if (!removeResult.isSuccess() && removeResult.getCode() != ResultCode.TIMEOUT) {
 			Utils.logAndThrow(LOG_TAG, removeResult);
 		}
 		super.tearDown();
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/RenameFileTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/RenameFileTest.java
index 16e34e1d..423da553 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/RenameFileTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/RenameFileTest.java
@@ -77,7 +77,7 @@ public class RenameFileTest extends ActivityInstrumentationTestCase2<TestActivit
 	    	
 			Log.v(LOG_TAG, "Starting global set up");
 			RemoteOperationResult result = mActivity.createFolder(OLD_FOLDER_NAME, true);
-			if (!result.isSuccess()) {
+			if (!result.isSuccess() && result.getCode() != ResultCode.TIMEOUT) {
 				Utils.logAndThrow(LOG_TAG, result);
 			}
 			
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/UploadFileTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/UploadFileTest.java
index 3566674d..8330e208 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/UploadFileTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/UploadFileTest.java
@@ -29,6 +29,7 @@ import java.io.File;
 import android.test.ActivityInstrumentationTestCase2;
 
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.test_project.TestActivity;
 
 /**
@@ -115,9 +116,9 @@ public class UploadFileTest extends ActivityInstrumentationTestCase2<TestActivit
 
 	@Override
 	protected void tearDown() throws Exception {
-		if (mUploadedFilePath != null && !mUploadedFilePath.equals(FILE_NOT_FOUND_PATH)) {
+		if (mUploadedFilePath != null) {
 			RemoteOperationResult removeResult = mActivity.removeFile(mUploadedFilePath);
-			if (!removeResult.isSuccess()) {
+			if (!removeResult.isSuccess() && removeResult.getCode() != ResultCode.TIMEOUT) {
 				Utils.logAndThrow(LOG_TAG, removeResult);
 			}
 		}