diff --git a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java
index 56c724cc5..3dc45f84a 100644
--- a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java
+++ b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java
@@ -102,7 +102,7 @@ public class RepeatTaskCompleteListener extends BroadcastReceiver {
     }
 
     /** for debug */
-    static void setSkipActFmCheck(boolean skipActFmCheck) {
+    public static void setSkipActFmCheck(boolean skipActFmCheck) {
         RepeatTaskCompleteListener.skipActFmCheck = skipActFmCheck;
     }
 
diff --git a/tests/src/com/todoroo/astrid/AllTests.java b/tests/src/com/todoroo/astrid/AllTests.java
index 2f1b2e1be..ee8584ee1 100644
--- a/tests/src/com/todoroo/astrid/AllTests.java
+++ b/tests/src/com/todoroo/astrid/AllTests.java
@@ -18,7 +18,6 @@ package com.todoroo.astrid;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
-
 import android.test.suitebuilder.TestSuiteBuilder;
 
 /**
@@ -47,7 +46,10 @@ public class AllTests extends TestSuite {
 
     public static Test suite() {
         return new TestSuiteBuilder(AllTests.class)
-                .includeAllPackagesUnderHere()
-                .build();
+            .excludePackages(
+                "com.todoroo.astrid.gtasks",
+                "com.todoroo.astrid.producteev",
+                "com.todoroo.astrid.sync.repeats")
+            .build();
     }
 }
diff --git a/tests/src/com/todoroo/astrid/ContinuousTests.java b/tests/src/com/todoroo/astrid/ContinuousTests.java
new file mode 100644
index 000000000..543024650
--- /dev/null
+++ b/tests/src/com/todoroo/astrid/ContinuousTests.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.todoroo.astrid;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import android.test.suitebuilder.TestSuiteBuilder;
+
+/**
+ * A test suite containing all tests for ApiDemos.
+ *
+ * To run all suites found in this apk:
+ * $ adb shell am instrument -w \
+ *   com.example.android.apis.tests/android.test.InstrumentationTestRunner
+ *
+ * To run just this suite from the command line:
+ * $ adb shell am instrument -w \
+ *   -e class com.example.android.apis.AllTests \
+ *   com.example.android.apis.tests/android.test.InstrumentationTestRunner
+ *
+ * To run an individual test case, e.g. {@link com.example.android.apis.os.MorseCodeConverterTest}:
+ * $ adb shell am instrument -w \
+ *   -e class com.example.android.apis.os.MorseCodeConverterTest \
+ *   com.example.android.apis.tests/android.test.InstrumentationTestRunner
+ *
+ * To run an individual test, e.g. {@link com.example.android.apis.os.MorseCodeConverterTest#testCharacterS()}:
+ * $ adb shell am instrument -w \
+ *   -e class com.example.android.apis.os.MorseCodeConverterTest#testCharacterS \
+ *   com.example.android.apis.tests/android.test.InstrumentationTestRunner
+ */
+public class ContinuousTests extends TestSuite {
+
+    public static Test suite() {
+        return new TestSuiteBuilder(ContinuousTests.class)
+            .excludePackages(
+                "com.todoroo.astrid.gtasks",
+                "com.todoroo.astrid.producteev",
+                "com.todoroo.astrid.sync.repeats")
+            .build();
+    }
+}
diff --git a/tests/src/com/todoroo/astrid/NightlyTests.java b/tests/src/com/todoroo/astrid/NightlyTests.java
new file mode 100644
index 000000000..ee32fb7b9
--- /dev/null
+++ b/tests/src/com/todoroo/astrid/NightlyTests.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.todoroo.astrid;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import android.test.suitebuilder.TestSuiteBuilder;
+
+/**
+ * A test suite containing activity-related tests
+ */
+public class NightlyTests extends TestSuite {
+
+    public static Test suite() {
+        return new TestSuiteBuilder(NightlyTests.class)
+                .includeAllPackagesUnderHere()
+                .build();
+    }
+
+
+}
diff --git a/tests/src/com/todoroo/astrid/repeats/NewRepeatTests.java b/tests/src/com/todoroo/astrid/repeats/NewRepeatTests.java
index 41389dfc5..5d6bf4152 100644
--- a/tests/src/com/todoroo/astrid/repeats/NewRepeatTests.java
+++ b/tests/src/com/todoroo/astrid/repeats/NewRepeatTests.java
@@ -29,10 +29,10 @@ import com.todoroo.astrid.utility.Flags;
 public class NewRepeatTests<REMOTE_MODEL> extends DatabaseTestCase {
 
     @Autowired
-    TaskDao taskDao;
+    protected TaskDao taskDao;
 
     @Autowired
-    MetadataDao metadataDao;
+    protected MetadataDao metadataDao;
 
     @Override
     protected void setUp() throws Exception {
@@ -66,6 +66,9 @@ public class NewRepeatTests<REMOTE_MODEL> extends DatabaseTestCase {
         return null;
     }
 
+    /**
+     * @param t task
+     */
     protected void assertTaskCompletedRemotely(Task t) {
         // Subclasses can override this to check the status of the corresponding remote task
     }
diff --git a/tests/src/com/todoroo/astrid/repeats/RepeatTestsActFmSync.java b/tests/src/com/todoroo/astrid/sync/repeats/RepeatTestsActFmSync.java
similarity index 97%
rename from tests/src/com/todoroo/astrid/repeats/RepeatTestsActFmSync.java
rename to tests/src/com/todoroo/astrid/sync/repeats/RepeatTestsActFmSync.java
index a770915b5..1326e3564 100644
--- a/tests/src/com/todoroo/astrid/repeats/RepeatTestsActFmSync.java
+++ b/tests/src/com/todoroo/astrid/sync/repeats/RepeatTestsActFmSync.java
@@ -1,4 +1,4 @@
-package com.todoroo.astrid.repeats;
+package com.todoroo.astrid.sync.repeats;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -23,6 +23,8 @@ import com.todoroo.astrid.actfm.sync.ActFmSyncService;
 import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
 import com.todoroo.astrid.data.Metadata;
 import com.todoroo.astrid.data.Task;
+import com.todoroo.astrid.repeats.NewRepeatTests;
+import com.todoroo.astrid.repeats.RepeatTaskCompleteListener;
 import com.todoroo.astrid.service.MetadataService;
 import com.todoroo.astrid.service.StartupService;
 
diff --git a/tests/src/com/todoroo/astrid/repeats/RepeatTestsActFmSyncRemote.java b/tests/src/com/todoroo/astrid/sync/repeats/RepeatTestsActFmSyncRemote.java
similarity index 98%
rename from tests/src/com/todoroo/astrid/repeats/RepeatTestsActFmSyncRemote.java
rename to tests/src/com/todoroo/astrid/sync/repeats/RepeatTestsActFmSyncRemote.java
index 0032e8847..e07fafe6b 100644
--- a/tests/src/com/todoroo/astrid/repeats/RepeatTestsActFmSyncRemote.java
+++ b/tests/src/com/todoroo/astrid/sync/repeats/RepeatTestsActFmSyncRemote.java
@@ -1,4 +1,4 @@
-package com.todoroo.astrid.repeats;
+package com.todoroo.astrid.sync.repeats;
 
 import java.util.ArrayList;
 
diff --git a/tests/src/com/todoroo/astrid/repeats/RepeatTestsGtasksSync.java b/tests/src/com/todoroo/astrid/sync/repeats/RepeatTestsGtasksSync.java
similarity index 97%
rename from tests/src/com/todoroo/astrid/repeats/RepeatTestsGtasksSync.java
rename to tests/src/com/todoroo/astrid/sync/repeats/RepeatTestsGtasksSync.java
index 7f04f9b3d..1a02733dd 100644
--- a/tests/src/com/todoroo/astrid/repeats/RepeatTestsGtasksSync.java
+++ b/tests/src/com/todoroo/astrid/sync/repeats/RepeatTestsGtasksSync.java
@@ -1,4 +1,4 @@
-package com.todoroo.astrid.repeats;
+package com.todoroo.astrid.sync.repeats;
 
 import java.io.IOException;
 import java.util.Date;
@@ -25,6 +25,8 @@ import com.todoroo.astrid.gtasks.api.GtasksApiUtilities;
 import com.todoroo.astrid.gtasks.api.GtasksService;
 import com.todoroo.astrid.gtasks.auth.GtasksTokenValidator;
 import com.todoroo.astrid.gtasks.sync.GtasksSyncProvider;
+import com.todoroo.astrid.repeats.NewRepeatTests;
+import com.todoroo.astrid.repeats.RepeatTaskCompleteListener;
 import com.todoroo.astrid.service.MetadataService;
 
 public class RepeatTestsGtasksSync extends NewRepeatTests<com.google.api.services.tasks.v1.model.Task> {
diff --git a/tests/src/com/todoroo/astrid/repeats/RepeatTestsGtasksSyncRemote.java b/tests/src/com/todoroo/astrid/sync/repeats/RepeatTestsGtasksSyncRemote.java
similarity index 97%
rename from tests/src/com/todoroo/astrid/repeats/RepeatTestsGtasksSyncRemote.java
rename to tests/src/com/todoroo/astrid/sync/repeats/RepeatTestsGtasksSyncRemote.java
index 62888ad5d..b74074b5c 100644
--- a/tests/src/com/todoroo/astrid/repeats/RepeatTestsGtasksSyncRemote.java
+++ b/tests/src/com/todoroo/astrid/sync/repeats/RepeatTestsGtasksSyncRemote.java
@@ -1,4 +1,4 @@
-package com.todoroo.astrid.repeats;
+package com.todoroo.astrid.sync.repeats;
 
 import java.io.IOException;
 import java.util.Date;
diff --git a/tests/src/com/todoroo/astrid/repeats/RepeatTestsProducteevSync.java b/tests/src/com/todoroo/astrid/sync/repeats/RepeatTestsProducteevSync.java
similarity index 98%
rename from tests/src/com/todoroo/astrid/repeats/RepeatTestsProducteevSync.java
rename to tests/src/com/todoroo/astrid/sync/repeats/RepeatTestsProducteevSync.java
index 56ff678e9..7be074a63 100644
--- a/tests/src/com/todoroo/astrid/repeats/RepeatTestsProducteevSync.java
+++ b/tests/src/com/todoroo/astrid/sync/repeats/RepeatTestsProducteevSync.java
@@ -1,4 +1,4 @@
-package com.todoroo.astrid.repeats;
+package com.todoroo.astrid.sync.repeats;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -14,6 +14,7 @@ import com.todoroo.astrid.producteev.api.ProducteevInvoker;
 import com.todoroo.astrid.producteev.sync.ProducteevDataService;
 import com.todoroo.astrid.producteev.sync.ProducteevSyncProvider;
 import com.todoroo.astrid.producteev.sync.ProducteevTask;
+import com.todoroo.astrid.repeats.NewRepeatTests;
 import com.todoroo.astrid.service.MetadataService;
 import com.todoroo.astrid.service.TaskService;
 import com.todoroo.astrid.tags.TagService;
diff --git a/tests/src/com/todoroo/astrid/repeats/RepeatTestsProducteevSyncRemote.java b/tests/src/com/todoroo/astrid/sync/repeats/RepeatTestsProducteevSyncRemote.java
similarity index 97%
rename from tests/src/com/todoroo/astrid/repeats/RepeatTestsProducteevSyncRemote.java
rename to tests/src/com/todoroo/astrid/sync/repeats/RepeatTestsProducteevSyncRemote.java
index b8a73a42c..e7b0d2a54 100644
--- a/tests/src/com/todoroo/astrid/repeats/RepeatTestsProducteevSyncRemote.java
+++ b/tests/src/com/todoroo/astrid/sync/repeats/RepeatTestsProducteevSyncRemote.java
@@ -1,4 +1,4 @@
-package com.todoroo.astrid.repeats;
+package com.todoroo.astrid.sync.repeats;
 
 import java.util.Date;