diff --git a/.gitignore b/.gitignore
index 17024537f..e148057dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,13 +5,16 @@ org.eclipse.ltk.core.refactoring.prefs
 gen
 local.properties
 antbuild
-astrid/bin
-actionbarsherlock/library/bin
 astrid/src-combined
 release
 dev
 lp-translations/
 translations/strings.xml
 .DS_Store
+
 greendroid/GDCatalog/.project
+
 api/bin
+astrid/bin
+actionbarsherlock/library/bin
+tests-sync/bin
diff --git a/tests-sync/.classpath b/tests-sync/.classpath
new file mode 100644
index 000000000..94408bfa2
--- /dev/null
+++ b/tests-sync/.classpath
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/astrid"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>
diff --git a/tests-sync/.project b/tests-sync/.project
new file mode 100644
index 000000000..0560d6d2a
--- /dev/null
+++ b/tests-sync/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>astrid-tests-sync</name>
+	<comment></comment>
+	<projects>
+		<project>astrid</project>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests-sync/AndroidManifest.xml b/tests-sync/AndroidManifest.xml
new file mode 100644
index 000000000..115cf9f4f
--- /dev/null
+++ b/tests-sync/AndroidManifest.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.timsu.astrid.test"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk android:minSdkVersion="7" />
+
+    <instrumentation
+        android:name="android.test.InstrumentationTestRunner"
+        android:targetPackage="com.timsu.astrid" />
+
+    <application
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name" >
+        <uses-library android:name="android.test.runner" />
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/tests-sync/proguard.cfg b/tests-sync/proguard.cfg
new file mode 100644
index 000000000..b1cdf17b5
--- /dev/null
+++ b/tests-sync/proguard.cfg
@@ -0,0 +1,40 @@
+-optimizationpasses 5
+-dontusemixedcaseclassnames
+-dontskipnonpubliclibraryclasses
+-dontpreverify
+-verbose
+-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
+
+-keep public class * extends android.app.Activity
+-keep public class * extends android.app.Application
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.app.backup.BackupAgentHelper
+-keep public class * extends android.preference.Preference
+-keep public class com.android.vending.licensing.ILicensingService
+
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
+
+-keepclasseswithmembers class * {
+    public <init>(android.content.Context, android.util.AttributeSet);
+}
+
+-keepclasseswithmembers class * {
+    public <init>(android.content.Context, android.util.AttributeSet, int);
+}
+
+-keepclassmembers class * extends android.app.Activity {
+   public void *(android.view.View);
+}
+
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+
+-keep class * implements android.os.Parcelable {
+  public static final android.os.Parcelable$Creator *;
+}
diff --git a/tests-sync/project.properties b/tests-sync/project.properties
new file mode 100644
index 000000000..730e911f2
--- /dev/null
+++ b/tests-sync/project.properties
@@ -0,0 +1,11 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system use,
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+
+# Project target.
+target=android-14
diff --git a/tests-sync/res/drawable-hdpi/ic_launcher.png b/tests-sync/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 000000000..8074c4c57
Binary files /dev/null and b/tests-sync/res/drawable-hdpi/ic_launcher.png differ
diff --git a/tests-sync/res/drawable-ldpi/ic_launcher.png b/tests-sync/res/drawable-ldpi/ic_launcher.png
new file mode 100644
index 000000000..1095584ec
Binary files /dev/null and b/tests-sync/res/drawable-ldpi/ic_launcher.png differ
diff --git a/tests-sync/res/drawable-mdpi/ic_launcher.png b/tests-sync/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 000000000..a07c69fa5
Binary files /dev/null and b/tests-sync/res/drawable-mdpi/ic_launcher.png differ
diff --git a/tests-sync/res/layout/main.xml b/tests-sync/res/layout/main.xml
new file mode 100644
index 000000000..bc12cd823
--- /dev/null
+++ b/tests-sync/res/layout/main.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/hello" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/tests-sync/res/values/strings.xml b/tests-sync/res/values/strings.xml
new file mode 100644
index 000000000..909abc50d
--- /dev/null
+++ b/tests-sync/res/values/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="hello">Hello World!</string>
+    <string name="app_name">Astrid-tests-syncTest</string>
+
+</resources>
\ No newline at end of file