diff --git a/tests/.classpath b/test_client/.classpath
similarity index 100%
rename from tests/.classpath
rename to test_client/.classpath
index 51769745..7bc01d9a 100644
--- a/tests/.classpath
+++ b/test_client/.classpath
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/tests/.project b/test_client/.project
similarity index 93%
rename from tests/.project
rename to test_client/.project
index 66824491..30c2462f 100644
--- a/tests/.project
+++ b/test_client/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>ownCloud Android Library Test Project</name>
+	<name>ownCloud Android library test project</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/tests/AndroidManifest.xml b/test_client/AndroidManifest.xml
similarity index 100%
rename from tests/AndroidManifest.xml
rename to test_client/AndroidManifest.xml
diff --git a/tests/assets/fileToUpload.png b/test_client/assets/fileToUpload.png
similarity index 100%
rename from tests/assets/fileToUpload.png
rename to test_client/assets/fileToUpload.png
diff --git a/tests/assets/fileToUploadChunks.MP4 b/test_client/assets/fileToUploadChunks.MP4
similarity index 100%
rename from tests/assets/fileToUploadChunks.MP4
rename to test_client/assets/fileToUploadChunks.MP4
diff --git a/test_client/build.xml b/test_client/build.xml
new file mode 100644
index 00000000..1be67e32
--- /dev/null
+++ b/test_client/build.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="ownCloud Android library test client" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>
diff --git a/tests/ic_launcher-web.png b/test_client/ic_launcher-web.png
similarity index 100%
rename from tests/ic_launcher-web.png
rename to test_client/ic_launcher-web.png
diff --git a/tests/libs/android-support-v4.jar b/test_client/libs/android-support-v4.jar
similarity index 100%
rename from tests/libs/android-support-v4.jar
rename to test_client/libs/android-support-v4.jar
diff --git a/tests/project.properties b/test_client/project.properties
similarity index 100%
rename from tests/project.properties
rename to test_client/project.properties
diff --git a/tests/res/drawable-hdpi/ic_launcher.png b/test_client/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from tests/res/drawable-hdpi/ic_launcher.png
rename to test_client/res/drawable-hdpi/ic_launcher.png
diff --git a/tests/res/drawable-mdpi/ic_launcher.png b/test_client/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from tests/res/drawable-mdpi/ic_launcher.png
rename to test_client/res/drawable-mdpi/ic_launcher.png
diff --git a/tests/res/drawable-xhdpi/ic_launcher.png b/test_client/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from tests/res/drawable-xhdpi/ic_launcher.png
rename to test_client/res/drawable-xhdpi/ic_launcher.png
diff --git a/tests/res/drawable-xxhdpi/ic_launcher.png b/test_client/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from tests/res/drawable-xxhdpi/ic_launcher.png
rename to test_client/res/drawable-xxhdpi/ic_launcher.png
diff --git a/tests/res/layout/activity_test.xml b/test_client/res/layout/activity_test.xml
similarity index 100%
rename from tests/res/layout/activity_test.xml
rename to test_client/res/layout/activity_test.xml
diff --git a/tests/res/menu/test.xml b/test_client/res/menu/test.xml
similarity index 100%
rename from tests/res/menu/test.xml
rename to test_client/res/menu/test.xml
diff --git a/tests/res/values-sw600dp/dimens.xml b/test_client/res/values-sw600dp/dimens.xml
similarity index 100%
rename from tests/res/values-sw600dp/dimens.xml
rename to test_client/res/values-sw600dp/dimens.xml
diff --git a/tests/res/values-sw720dp-land/dimens.xml b/test_client/res/values-sw720dp-land/dimens.xml
similarity index 100%
rename from tests/res/values-sw720dp-land/dimens.xml
rename to test_client/res/values-sw720dp-land/dimens.xml
diff --git a/tests/res/values-v11/styles.xml b/test_client/res/values-v11/styles.xml
similarity index 100%
rename from tests/res/values-v11/styles.xml
rename to test_client/res/values-v11/styles.xml
diff --git a/tests/res/values-v14/styles.xml b/test_client/res/values-v14/styles.xml
similarity index 100%
rename from tests/res/values-v14/styles.xml
rename to test_client/res/values-v14/styles.xml
diff --git a/tests/res/values/dimens.xml b/test_client/res/values/dimens.xml
similarity index 100%
rename from tests/res/values/dimens.xml
rename to test_client/res/values/dimens.xml
diff --git a/tests/res/values/setup.xml b/test_client/res/values/setup.xml
similarity index 100%
rename from tests/res/values/setup.xml
rename to test_client/res/values/setup.xml
diff --git a/tests/res/values/strings.xml b/test_client/res/values/strings.xml
similarity index 100%
rename from tests/res/values/strings.xml
rename to test_client/res/values/strings.xml
diff --git a/tests/res/values/styles.xml b/test_client/res/values/styles.xml
similarity index 100%
rename from tests/res/values/styles.xml
rename to test_client/res/values/styles.xml
diff --git a/tests/src/com/owncloud/android/lib/test_project/TestActivity.java b/test_client/src/com/owncloud/android/lib/test_project/TestActivity.java
similarity index 100%
rename from tests/src/com/owncloud/android/lib/test_project/TestActivity.java
rename to test_client/src/com/owncloud/android/lib/test_project/TestActivity.java
diff --git a/tests/test_cases/.classpath b/test_client/tests/.classpath
similarity index 76%
rename from tests/test_cases/.classpath
rename to test_client/tests/.classpath
index 08ef9591..d1c3047c 100644
--- a/tests/test_cases/.classpath
+++ b/test_client/tests/.classpath
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ownCloud Android Library Test Project"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ownCloud Android library test project"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/tests/test_cases/.project b/test_client/tests/.project
similarity index 94%
rename from tests/test_cases/.project
rename to test_client/tests/.project
index 54097574..f4fb0109 100644
--- a/tests/test_cases/.project
+++ b/test_client/tests/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>ownCloud Android Library Tests</name>
+	<name>ownCloud Android library test cases</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/tests/test_cases/AndroidManifest.xml b/test_client/tests/AndroidManifest.xml
similarity index 100%
rename from tests/test_cases/AndroidManifest.xml
rename to test_client/tests/AndroidManifest.xml
diff --git a/test_client/tests/ant.properties b/test_client/tests/ant.properties
new file mode 100644
index 00000000..16244024
--- /dev/null
+++ b/test_client/tests/ant.properties
@@ -0,0 +1,18 @@
+# This file is used to override default values used by the Ant build system.
+#
+# This file must be checked into Version Control Systems, as it is
+# integral to the build system of your project.
+
+# This file is only used by the Ant script.
+
+# You can use this to override default values such as
+#  'source.dir' for the location of your java source folder and
+#  'out.dir' for the location of your output folder.
+
+# You can also use it define how the release builds are signed by declaring
+# the following properties:
+#  'key.store' for the location of your keystore and
+#  'key.alias' for the name of the key to use.
+# The password will be asked during the build when you use the 'release' target.
+
+tested.project.dir=..
diff --git a/test_client/tests/build.xml b/test_client/tests/build.xml
new file mode 100644
index 00000000..b3a5cb6a
--- /dev/null
+++ b/test_client/tests/build.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="ownCloud Android library test cases" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>
diff --git a/tests/test_cases/project.properties b/test_client/tests/project.properties
similarity index 100%
rename from tests/test_cases/project.properties
rename to test_client/tests/project.properties
diff --git a/tests/test_cases/res/drawable-hdpi/ic_launcher.png b/test_client/tests/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from tests/test_cases/res/drawable-hdpi/ic_launcher.png
rename to test_client/tests/res/drawable-hdpi/ic_launcher.png
diff --git a/tests/test_cases/res/drawable-ldpi/ic_launcher.png b/test_client/tests/res/drawable-ldpi/ic_launcher.png
similarity index 100%
rename from tests/test_cases/res/drawable-ldpi/ic_launcher.png
rename to test_client/tests/res/drawable-ldpi/ic_launcher.png
diff --git a/tests/test_cases/res/drawable-mdpi/ic_launcher.png b/test_client/tests/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from tests/test_cases/res/drawable-mdpi/ic_launcher.png
rename to test_client/tests/res/drawable-mdpi/ic_launcher.png
diff --git a/tests/test_cases/res/drawable-xhdpi/ic_launcher.png b/test_client/tests/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from tests/test_cases/res/drawable-xhdpi/ic_launcher.png
rename to test_client/tests/res/drawable-xhdpi/ic_launcher.png
diff --git a/tests/test_cases/res/values/strings.xml b/test_client/tests/res/values/strings.xml
similarity index 100%
rename from tests/test_cases/res/values/strings.xml
rename to test_client/tests/res/values/strings.xml
diff --git a/tests/test_cases/src/com/owncloud/android/lib/test_project/test/CreateFolderTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/CreateFolderTest.java
similarity index 100%
rename from tests/test_cases/src/com/owncloud/android/lib/test_project/test/CreateFolderTest.java
rename to test_client/tests/src/com/owncloud/android/lib/test_project/test/CreateFolderTest.java
diff --git a/tests/test_cases/src/com/owncloud/android/lib/test_project/test/CreateShareTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/CreateShareTest.java
similarity index 100%
rename from tests/test_cases/src/com/owncloud/android/lib/test_project/test/CreateShareTest.java
rename to test_client/tests/src/com/owncloud/android/lib/test_project/test/CreateShareTest.java
diff --git a/tests/test_cases/src/com/owncloud/android/lib/test_project/test/DeleteFileTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/DeleteFileTest.java
similarity index 100%
rename from tests/test_cases/src/com/owncloud/android/lib/test_project/test/DeleteFileTest.java
rename to test_client/tests/src/com/owncloud/android/lib/test_project/test/DeleteFileTest.java
diff --git a/tests/test_cases/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java
similarity index 100%
rename from tests/test_cases/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java
rename to test_client/tests/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java
diff --git a/tests/test_cases/src/com/owncloud/android/lib/test_project/test/GetSharesTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/GetSharesTest.java
similarity index 100%
rename from tests/test_cases/src/com/owncloud/android/lib/test_project/test/GetSharesTest.java
rename to test_client/tests/src/com/owncloud/android/lib/test_project/test/GetSharesTest.java
diff --git a/tests/test_cases/src/com/owncloud/android/lib/test_project/test/ReadFileTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/ReadFileTest.java
similarity index 100%
rename from tests/test_cases/src/com/owncloud/android/lib/test_project/test/ReadFileTest.java
rename to test_client/tests/src/com/owncloud/android/lib/test_project/test/ReadFileTest.java
diff --git a/tests/test_cases/src/com/owncloud/android/lib/test_project/test/ReadFolderTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/ReadFolderTest.java
similarity index 100%
rename from tests/test_cases/src/com/owncloud/android/lib/test_project/test/ReadFolderTest.java
rename to test_client/tests/src/com/owncloud/android/lib/test_project/test/ReadFolderTest.java
diff --git a/tests/test_cases/src/com/owncloud/android/lib/test_project/test/RemoveShareTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/RemoveShareTest.java
similarity index 100%
rename from tests/test_cases/src/com/owncloud/android/lib/test_project/test/RemoveShareTest.java
rename to test_client/tests/src/com/owncloud/android/lib/test_project/test/RemoveShareTest.java
diff --git a/tests/test_cases/src/com/owncloud/android/lib/test_project/test/RenameFileTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/RenameFileTest.java
similarity index 100%
rename from tests/test_cases/src/com/owncloud/android/lib/test_project/test/RenameFileTest.java
rename to test_client/tests/src/com/owncloud/android/lib/test_project/test/RenameFileTest.java
diff --git a/tests/test_cases/src/com/owncloud/android/lib/test_project/test/UploadFileTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/UploadFileTest.java
similarity index 100%
rename from tests/test_cases/src/com/owncloud/android/lib/test_project/test/UploadFileTest.java
rename to test_client/tests/src/com/owncloud/android/lib/test_project/test/UploadFileTest.java
diff --git a/tests/.settings/org.eclipse.jdt.core.prefs b/tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b080d2dd..00000000
--- a/tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/tests/test_cases/.settings/org.eclipse.jdt.core.prefs b/tests/test_cases/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b080d2dd..00000000
--- a/tests/test_cases/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.source=1.6