diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.tests/.classpath b/tools/eclipse/plugins/com.android.ide.eclipse.tests/.classpath
index 972a54865..e0778f44c 100644
--- a/tools/eclipse/plugins/com.android.ide.eclipse.tests/.classpath
+++ b/tools/eclipse/plugins/com.android.ide.eclipse.tests/.classpath
@@ -4,10 +4,10 @@
 	<classpathentry kind="src" path="unittests"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="lib" path="/adt/kxml2-2.3.0.jar"/>
 	<classpathentry kind="lib" path="/adt/sdklib.jar" sourcepath="/SdkLib"/>
 	<classpathentry kind="lib" path="/adt/layoutlib_api.jar" sourcepath="/layoutlib_api"/>
 	<classpathentry kind="lib" path="/adt/ninepatch.jar"/>
 	<classpathentry kind="lib" path="layoutlib.jar"/>
+	<classpathentry kind="lib" path="kxml2-2.3.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tools/eclipse/scripts/create_test_symlinks.sh b/tools/eclipse/scripts/create_test_symlinks.sh
index 913f24fbe..899625838 100755
--- a/tools/eclipse/scripts/create_test_symlinks.sh
+++ b/tools/eclipse/scripts/create_test_symlinks.sh
@@ -31,16 +31,20 @@ BACK=`back $DEST`
 
 HOST=`uname`
 if [ "$HOST" == "Linux" ]; then
+    ln -svf $BACK/out/host/linux-x86/framework/kxml2-2.3.0.jar "$DEST/"
     ln -svf $BACK/out/host/linux-x86/framework/layoutlib.jar "$DEST/"
-
 elif [ "$HOST" == "Darwin" ]; then
+    ln -svf $BACK/out/host/darwin-x86/framework/kxml2-2.3.0.jar "$DEST/"
     ln -svf $BACK/out/host/darwin-x86/framework/layoutlib.jar "$DEST/"
 
 elif [ "${HOST:0:6}" == "CYGWIN" ]; then
+    if [ ! -f "$DEST/kxml2-2.3.0.jar" ]; then
+        cp -v "prebuilt/common/kxml2/kxml2-2.3.0.jar" "$DEST/"
+    fi
+
     cp -v "$BACK/out/host/windows/framework/layoutlib.jar" "$DEST/"
 
     chmod -v a+rx "$DEST"/*.jar
-
 else
     echo "Unsupported platform ($HOST). Nothing done."
 fi
@@ -51,8 +55,6 @@ cpdir $DEST development/tools/ddms/libs/ddmlib/tests/src/com/android/ddmlib
 cpdir $DEST development/tools/sdkmanager/libs/sdklib/tests/com/android/sdklib
 
 DEST=$BASE/unittests/com/android/layoutlib
-if [ ! -d "$DEST" ]; then
-	mkdir $DEST
-fi
+mkdir -p $DEST
 cpdir $DEST frameworks/base/tools/layoutlib/bridge/tests/com/android/layoutlib/bridge