diff --git a/tests/src/com/todoroo/andlib/service/DependencyInjectionTests.java b/astrid/src/instrumentTest/java/com/todoroo/andlib/service/DependencyInjectionTests.java
similarity index 100%
rename from tests/src/com/todoroo/andlib/service/DependencyInjectionTests.java
rename to astrid/src/instrumentTest/java/com/todoroo/andlib/service/DependencyInjectionTests.java
diff --git a/tests/src/com/todoroo/andlib/service/TestDependencyInjector.java b/astrid/src/instrumentTest/java/com/todoroo/andlib/service/TestDependencyInjector.java
similarity index 100%
rename from tests/src/com/todoroo/andlib/service/TestDependencyInjector.java
rename to astrid/src/instrumentTest/java/com/todoroo/andlib/service/TestDependencyInjector.java
diff --git a/tests/src/com/todoroo/andlib/sql/QueryTemplateHelperTest.java b/astrid/src/instrumentTest/java/com/todoroo/andlib/sql/QueryTemplateHelperTest.java
similarity index 100%
rename from tests/src/com/todoroo/andlib/sql/QueryTemplateHelperTest.java
rename to astrid/src/instrumentTest/java/com/todoroo/andlib/sql/QueryTemplateHelperTest.java
diff --git a/tests/src/com/todoroo/andlib/test/SimpleAndroidTest.java b/astrid/src/instrumentTest/java/com/todoroo/andlib/test/SimpleAndroidTest.java
similarity index 100%
rename from tests/src/com/todoroo/andlib/test/SimpleAndroidTest.java
rename to astrid/src/instrumentTest/java/com/todoroo/andlib/test/SimpleAndroidTest.java
diff --git a/tests/src/com/todoroo/andlib/test/TestUtilities.java b/astrid/src/instrumentTest/java/com/todoroo/andlib/test/TestUtilities.java
similarity index 100%
rename from tests/src/com/todoroo/andlib/test/TestUtilities.java
rename to astrid/src/instrumentTest/java/com/todoroo/andlib/test/TestUtilities.java
diff --git a/tests/src/com/todoroo/andlib/test/TodorooTestCase.java b/astrid/src/instrumentTest/java/com/todoroo/andlib/test/TodorooTestCase.java
similarity index 100%
rename from tests/src/com/todoroo/andlib/test/TodorooTestCase.java
rename to astrid/src/instrumentTest/java/com/todoroo/andlib/test/TodorooTestCase.java
diff --git a/tests/src/com/todoroo/andlib/test/TodorooTestCaseWithInjector.java b/astrid/src/instrumentTest/java/com/todoroo/andlib/test/TodorooTestCaseWithInjector.java
similarity index 100%
rename from tests/src/com/todoroo/andlib/test/TodorooTestCaseWithInjector.java
rename to astrid/src/instrumentTest/java/com/todoroo/andlib/test/TodorooTestCaseWithInjector.java
diff --git a/tests/src/com/todoroo/andlib/test/TranslationTests.java b/astrid/src/instrumentTest/java/com/todoroo/andlib/test/TranslationTests.java
similarity index 100%
rename from tests/src/com/todoroo/andlib/test/TranslationTests.java
rename to astrid/src/instrumentTest/java/com/todoroo/andlib/test/TranslationTests.java
diff --git a/tests/src/com/todoroo/andlib/utility/DateUtilitiesTest.java b/astrid/src/instrumentTest/java/com/todoroo/andlib/utility/DateUtilitiesTest.java
similarity index 100%
rename from tests/src/com/todoroo/andlib/utility/DateUtilitiesTest.java
rename to astrid/src/instrumentTest/java/com/todoroo/andlib/utility/DateUtilitiesTest.java
diff --git a/tests/src/com/todoroo/astrid/AllTests.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/AllTests.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/AllTests.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/AllTests.java
diff --git a/tests/src/com/todoroo/astrid/backup/BackupServiceTests.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/backup/BackupServiceTests.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/backup/BackupServiceTests.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/backup/BackupServiceTests.java
diff --git a/tests/src/com/todoroo/astrid/dao/DatabaseDaoTests.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/dao/DatabaseDaoTests.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/dao/DatabaseDaoTests.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/dao/DatabaseDaoTests.java
diff --git a/tests/src/com/todoroo/astrid/dao/MetadataDaoTests.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/dao/MetadataDaoTests.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/dao/MetadataDaoTests.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/dao/MetadataDaoTests.java
diff --git a/tests/src/com/todoroo/astrid/dao/TaskDaoTests.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/dao/TaskDaoTests.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/dao/TaskDaoTests.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/dao/TaskDaoTests.java
diff --git a/tests/src/com/todoroo/astrid/gtasks/GtasksDetailExposerTest.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksDetailExposerTest.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/gtasks/GtasksDetailExposerTest.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksDetailExposerTest.java
diff --git a/tests/src/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java
diff --git a/tests/src/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java
diff --git a/tests/src/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java
diff --git a/tests/src/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java
diff --git a/tests/src/com/todoroo/astrid/gtasks/GtasksTestPreferenceService.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksTestPreferenceService.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/gtasks/GtasksTestPreferenceService.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksTestPreferenceService.java
diff --git a/tests/src/com/todoroo/astrid/model/TaskTests.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/model/TaskTests.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/model/TaskTests.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/model/TaskTests.java
diff --git a/tests/src/com/todoroo/astrid/provider/Astrid3ProviderTests.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/provider/Astrid3ProviderTests.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/provider/Astrid3ProviderTests.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/provider/Astrid3ProviderTests.java
diff --git a/tests/src/com/todoroo/astrid/provider/ProviderTestUtilities.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/provider/ProviderTestUtilities.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/provider/ProviderTestUtilities.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/provider/ProviderTestUtilities.java
diff --git a/tests/src/com/todoroo/astrid/reminders/NotificationTests.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/reminders/NotificationTests.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/reminders/NotificationTests.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/reminders/NotificationTests.java
diff --git a/tests/src/com/todoroo/astrid/reminders/ReminderServiceTests.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/reminders/ReminderServiceTests.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/reminders/ReminderServiceTests.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/reminders/ReminderServiceTests.java
diff --git a/tests/src/com/todoroo/astrid/repeats/AdvancedRepeatTests.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/repeats/AdvancedRepeatTests.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/repeats/AdvancedRepeatTests.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/repeats/AdvancedRepeatTests.java
diff --git a/tests/src/com/todoroo/astrid/repeats/NewRepeatTests.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/repeats/NewRepeatTests.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java
diff --git a/tests/src/com/todoroo/astrid/repeats/RepeatAfterCompleteTests.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/repeats/RepeatAfterCompleteTests.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/repeats/RepeatAfterCompleteTests.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/repeats/RepeatAfterCompleteTests.java
diff --git a/tests/src/com/todoroo/astrid/service/AstridDependencyInjectorTests.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/service/AstridDependencyInjectorTests.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/service/AstridDependencyInjectorTests.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/service/AstridDependencyInjectorTests.java
diff --git a/tests/src/com/todoroo/astrid/service/QuickAddMarkupTest.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/service/QuickAddMarkupTest.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/service/QuickAddMarkupTest.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/service/QuickAddMarkupTest.java
diff --git a/tests/src/com/todoroo/astrid/service/TitleParserTest.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/service/TitleParserTest.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/service/TitleParserTest.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/service/TitleParserTest.java
diff --git a/tests/src/com/todoroo/astrid/service/UpdateMessageServiceTest.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/service/UpdateMessageServiceTest.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/service/UpdateMessageServiceTest.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/service/UpdateMessageServiceTest.java
diff --git a/tests/src/com/todoroo/astrid/subtasks/SubtasksHelperTest.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/subtasks/SubtasksHelperTest.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/subtasks/SubtasksHelperTest.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/subtasks/SubtasksHelperTest.java
diff --git a/tests/src/com/todoroo/astrid/subtasks/SubtasksMigrationTest.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/subtasks/SubtasksMigrationTest.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/subtasks/SubtasksMigrationTest.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/subtasks/SubtasksMigrationTest.java
diff --git a/tests/src/com/todoroo/astrid/subtasks/SubtasksMovingTest.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/subtasks/SubtasksMovingTest.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/subtasks/SubtasksMovingTest.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/subtasks/SubtasksMovingTest.java
diff --git a/tests/src/com/todoroo/astrid/subtasks/SubtasksTestCase.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/subtasks/SubtasksTestCase.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/subtasks/SubtasksTestCase.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/subtasks/SubtasksTestCase.java
diff --git a/tests/src/com/todoroo/astrid/sync/AstridNewSyncMigrationTest.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/sync/AstridNewSyncMigrationTest.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/sync/AstridNewSyncMigrationTest.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/sync/AstridNewSyncMigrationTest.java
diff --git a/tests/src/com/todoroo/astrid/sync/ConstructOutstandingFromMasterTest.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/sync/ConstructOutstandingFromMasterTest.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/sync/ConstructOutstandingFromMasterTest.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/sync/ConstructOutstandingFromMasterTest.java
diff --git a/tests/src/com/todoroo/astrid/sync/NewSyncTestCase.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/sync/NewSyncTestCase.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/sync/NewSyncTestCase.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/sync/NewSyncTestCase.java
diff --git a/tests/src/com/todoroo/astrid/sync/SyncMessageTest.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/sync/SyncMessageTest.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/sync/SyncMessageTest.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/sync/SyncMessageTest.java
diff --git a/tests/src/com/todoroo/astrid/sync/SyncModelTest.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/sync/SyncModelTest.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/sync/SyncModelTest.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/sync/SyncModelTest.java
diff --git a/tests/src/com/todoroo/astrid/test/AstridTranslationTests.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/test/AstridTranslationTests.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/test/AstridTranslationTests.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/test/AstridTranslationTests.java
diff --git a/tests/src/com/todoroo/astrid/test/DatabaseTestCase.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/test/DatabaseTestCase.java
similarity index 100%
rename from tests/src/com/todoroo/astrid/test/DatabaseTestCase.java
rename to astrid/src/instrumentTest/java/com/todoroo/astrid/test/DatabaseTestCase.java
diff --git a/tests/src/com/zutubi/android/junitreport/Compatibility.java b/astrid/src/instrumentTest/java/com/zutubi/android/junitreport/Compatibility.java
similarity index 100%
rename from tests/src/com/zutubi/android/junitreport/Compatibility.java
rename to astrid/src/instrumentTest/java/com/zutubi/android/junitreport/Compatibility.java
diff --git a/tests/src/com/zutubi/android/junitreport/JUnitReportListener.java b/astrid/src/instrumentTest/java/com/zutubi/android/junitreport/JUnitReportListener.java
similarity index 100%
rename from tests/src/com/zutubi/android/junitreport/JUnitReportListener.java
rename to astrid/src/instrumentTest/java/com/zutubi/android/junitreport/JUnitReportListener.java
diff --git a/tests/src/com/zutubi/android/junitreport/JUnitReportTestRunner.java b/astrid/src/instrumentTest/java/com/zutubi/android/junitreport/JUnitReportTestRunner.java
similarity index 100%
rename from tests/src/com/zutubi/android/junitreport/JUnitReportTestRunner.java
rename to astrid/src/instrumentTest/java/com/zutubi/android/junitreport/JUnitReportTestRunner.java
diff --git a/tests/res/.do.not.delete b/astrid/src/instrumentTest/res/.do.not.delete
similarity index 100%
rename from tests/res/.do.not.delete
rename to astrid/src/instrumentTest/res/.do.not.delete
diff --git a/tests/Android.mk b/tests/Android.mk
deleted file mode 100644
index 96dd1e2c0..000000000
--- a/tests/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-# Notice that we don't have to include the src files of ApiDemos because, by
-# running the tests using an instrumentation targeting ApiDemos, we
-# automatically get all of its classes loaded into our environment.
-
-LOCAL_PACKAGE_NAME := AstridTests
-
-LOCAL_INSTRUMENTATION_FOR := Astrid
-
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_PACKAGE)
-
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
deleted file mode 100644
index 02c5d171f..000000000
--- a/tests/AndroidManifest.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.todoroo.astrid.tests"
-          android:versionCode="1"
-          android:versionName="1.0">
-
-    <uses-sdk android:minSdkVersion="7" />
-
-    <!-- We add an application tag here just so that we can indicate that
-         this package needs to link against the android.test library,
-         which is needed when building test cases. -->
-    <application android:debuggable="true">
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-    <!--
-    This declares that this application uses the instrumentation test runner targeting
-    the package of the parent app.  To run the tests use the command:
-    "adb shell am instrument -w com.xxx.xxx.tests/android.test.InstrumentationTestRunner"
-    -->
-    <instrumentation android:name="com.zutubi.android.junitreport.JUnitReportTestRunner"
-                     android:targetPackage="com.timsu.astrid"
-                     android:label="Tests for Astrid"/>
-</manifest>
diff --git a/tests/project.properties b/tests/project.properties
deleted file mode 100644
index 98e627c3d..000000000
--- a/tests/project.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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-17
-android.library.reference.1=../api