diff --git a/tests/.classpath b/tests/.classpath
index 235ca48e1..f2a8f00d7 100644
--- a/tests/.classpath
+++ b/tests/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry excluding="com/todoroo/astrid/legacy/data/|com/todoroo/astrid/legacy/data/alerts/|com/todoroo/astrid/legacy/data/enums/|com/todoroo/astrid/legacy/data/sync/|com/todoroo/astrid/legacy/data/tag/|com/todoroo/astrid/legacy/data/task/|com/todoroo/astrid/upgrade/" kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/astrid"/>
diff --git a/tests/src/com/todoroo/astrid/service/QuickAddMarkupTest.java b/tests/src/com/todoroo/astrid/service/QuickAddMarkupTest.java
index 2c31106c7..90f028444 100644
--- a/tests/src/com/todoroo/astrid/service/QuickAddMarkupTest.java
+++ b/tests/src/com/todoroo/astrid/service/QuickAddMarkupTest.java
@@ -9,11 +9,11 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import com.todoroo.andlib.test.TodorooTestCase;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.producteev.ProducteevUtilities;
+import com.todoroo.astrid.test.DatabaseTestCase;
 
-public class QuickAddMarkupTest extends TodorooTestCase {
+public class QuickAddMarkupTest extends DatabaseTestCase {
 
     @Override
     protected void setUp() throws Exception {
diff --git a/tests/src/com/todoroo/astrid/upgrade/Astrid2To3UpgradeTests.java b/tests/src/com/todoroo/astrid/upgrade/Astrid2To3UpgradeTests.java
index 996c16e98..a60b63b54 100644
--- a/tests/src/com/todoroo/astrid/upgrade/Astrid2To3UpgradeTests.java
+++ b/tests/src/com/todoroo/astrid/upgrade/Astrid2To3UpgradeTests.java
@@ -7,8 +7,6 @@ package com.todoroo.astrid.upgrade;
 
 import java.util.Date;
 
-import android.util.Log;
-
 import com.google.ical.values.Frequency;
 import com.google.ical.values.RRule;
 import com.todoroo.andlib.data.TodorooCursor;
@@ -80,7 +78,6 @@ public class Astrid2To3UpgradeTests extends DatabaseTestCase {
         deleteDatabase(ALERTS_TEST);
         deleteDatabase(SYNC_TEST);
 
-        Log.e("haha", "setting up test", new Throwable());
         super.setUp();
 
         alarmsDatabase = new AlarmDatabase();