diff --git a/tools/eclipse/plugins/.gitignore b/tools/eclipse/plugins/.gitignore
index 6c13a2bd0..42a204e07 100644
--- a/tools/eclipse/plugins/.gitignore
+++ b/tools/eclipse/plugins/.gitignore
@@ -53,4 +53,5 @@ com.android.ide.eclipse.ddms/src/com/android/ddmlib
 com.android.ide.eclipse.ddms/src/com/android/ddmuilib
 com.android.ide.eclipse.tests/kxml2-2.3.0.jar
 com.android.ide.eclipse.tests/unittests/com/android/ddmlib
+com.android.ide.eclipse.tests/unittests/com/android/sdklib
 
diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/tests/UnitTests.java b/tools/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/tests/UnitTests.java
index 67e7cb23b..6c1510c72 100644
--- a/tools/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/tests/UnitTests.java
+++ b/tools/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/tests/UnitTests.java
@@ -31,16 +31,17 @@ import junit.framework.TestSuite;
  * 
  */                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
 public class UnitTests {
-    private static final String TEST_PACKAGE = "com.android.ide.eclipse";
+    private static final String TEST_PACKAGE = "com.android";
     
     public static Test suite() {
         TestSuite suite = new TestSuite();
-        
+
         UnitTestCollector collector = new UnitTestCollector();
         collector.addTestCases(suite, AndroidTestPlugin.getDefault(), TEST_PACKAGE);
+
         return suite;
     }
-    
+
     /**
      * Specialized test collector which will skip adding functional tests
      */
@@ -54,5 +55,4 @@ public class UnitTests {
             !testClass.getPackage().getName().startsWith(FuncTests.FUNC_TEST_PACKAGE);
         }
     }
-
 }
diff --git a/tools/eclipse/scripts/create_test_symlinks.sh b/tools/eclipse/scripts/create_test_symlinks.sh
index 931dce885..149a1426c 100755
--- a/tools/eclipse/scripts/create_test_symlinks.sh
+++ b/tools/eclipse/scripts/create_test_symlinks.sh
@@ -51,4 +51,5 @@ fi
 DEST=$BASE/unittests/com/android
 BACK=`back $DEST`
 cpdir $DEST development/tools/ddms/libs/ddmlib/tests/src/com/android/ddmlib
+cpdir $DEST development/tools/sdkmanager/libs/sdklib/tests/com/android/sdklib