diff --git a/tests-sync/src/com/todoroo/astrid/sync/AstridNewSyncMigrationTest.java b/tests-sync/src/com/todoroo/astrid/sync/AstridNewSyncMigrationTest.java
index 0473d4eb4..4f43f3335 100644
--- a/tests-sync/src/com/todoroo/astrid/sync/AstridNewSyncMigrationTest.java
+++ b/tests-sync/src/com/todoroo/astrid/sync/AstridNewSyncMigrationTest.java
@@ -5,6 +5,7 @@ import java.util.ArrayList;
 import android.text.TextUtils;
 
 import com.todoroo.andlib.data.Property;
+import com.todoroo.andlib.data.Property.LongProperty;
 import com.todoroo.andlib.data.Table;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
@@ -22,6 +23,9 @@ import com.todoroo.astrid.tags.TaskToTagMetadata;
 
 public class AstridNewSyncMigrationTest extends NewSyncTestCase {
 
+	private static final LongProperty TASK_REMOTE_ID_FIELD = new LongProperty(Task.TABLE, RemoteModel.UUID_PROPERTY_NAME);
+	private static final LongProperty TAG_REMOTE_ID_FIELD = new LongProperty(TagData.TABLE, RemoteModel.UUID_PROPERTY_NAME);
+	
 	@Autowired
 	private MetadataDao metadataDao;
 	
@@ -38,11 +42,11 @@ public class AstridNewSyncMigrationTest extends NewSyncTestCase {
 		// Init 5 unsynced tasks and tags
 		for (int i = 1; i <= 5; i++) {
 			Task task = createTask("Task " + i, true);
-			task.setValue(Task.REMOTE_ID, null);
+			task.setValue(TASK_REMOTE_ID_FIELD, 0L);
 			taskDao.save(task);
 			
 			TagData tag = createTagData("Tag " + i, true);
-			tag.setValue(TagData.REMOTE_ID, null);
+			tag.setValue(TAG_REMOTE_ID_FIELD, 0L);
 			tagDataDao.saveExisting(tag);
 		}
 		
diff --git a/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsActFmSync.java b/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsActFmSync.java
index 1ab1fb990..fe9b0321d 100644
--- a/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsActFmSync.java
+++ b/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsActFmSync.java
@@ -124,7 +124,7 @@ public class RepeatTestsActFmSync extends AbstractSyncRepeatTests<Task> {
     protected Task assertTaskExistsRemotely(Task t, long expectedDueDate) {
         Task remote = new Task();
         try {
-            ActFmSyncService.JsonHelper.taskFromJson(invoker.invoke("task_show", "id", t.getValue(Task.REMOTE_ID)), remote,
+            ActFmSyncService.JsonHelper.taskFromJson(invoker.invoke("task_show", "id", t.getValue(Task.UUID)), remote,
                     new ArrayList<Metadata>());
             assertTimesMatch(expectedDueDate, remote.getValue(Task.DUE_DATE).longValue());
         } catch (Exception e) {
diff --git a/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsActFmSyncRemote.java b/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsActFmSyncRemote.java
index 971b21f6f..c43553680 100644
--- a/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsActFmSyncRemote.java
+++ b/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsActFmSyncRemote.java
@@ -19,7 +19,7 @@ public class RepeatTestsActFmSyncRemote extends RepeatTestsActFmSync {
         ArrayList<Object> params = new ArrayList<Object>();
         params.add("completed"); params.add(completionDate / 1000L);
 
-        params.add("id"); params.add(remoteModel.getValue(Task.REMOTE_ID));
+        params.add("id"); params.add(remoteModel.getValue(Task.UUID));
         try {
             invoker.invoke("task_save", params.toArray(new Object[params.size()]));
         } catch (Exception e) {