diff --git a/tools/eclipse/plugins/.gitignore b/tools/eclipse/plugins/.gitignore
index 42a204e07..076f28415 100644
--- a/tools/eclipse/plugins/.gitignore
+++ b/tools/eclipse/plugins/.gitignore
@@ -54,4 +54,5 @@ 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
+com.android.ide.eclipse.tests/unittests/com/android/layoutlib
 
diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.tests/.classpath b/tools/eclipse/plugins/com.android.ide.eclipse.tests/.classpath
index 576266868..972a54865 100644
--- a/tools/eclipse/plugins/com.android.ide.eclipse.tests/.classpath
+++ b/tools/eclipse/plugins/com.android.ide.eclipse.tests/.classpath
@@ -4,8 +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="kxml2-2.3.0.jar"/>
+	<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="output" path="bin"/>
 </classpath>
diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.tests/build.properties b/tools/eclipse/plugins/com.android.ide.eclipse.tests/build.properties
index 8649a7727..4110b98b2 100644
--- a/tools/eclipse/plugins/com.android.ide.eclipse.tests/build.properties
+++ b/tools/eclipse/plugins/com.android.ide.eclipse.tests/build.properties
@@ -9,4 +9,5 @@ bin.includes = META-INF/,\
                kxml2-2.3.0.jar,\
                unittests/data/,\
                sdklib.jar,\
-               layoutlib_api.jar
+               layoutlib_api.jar,\
+               layoutlib.jar
diff --git a/tools/eclipse/scripts/create_test_symlinks.sh b/tools/eclipse/scripts/create_test_symlinks.sh
index 149a1426c..fa5fd63f8 100755
--- a/tools/eclipse/scripts/create_test_symlinks.sh
+++ b/tools/eclipse/scripts/create_test_symlinks.sh
@@ -31,17 +31,15 @@ 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
+    cp -v "$BACK/out/host/windows/framework/layoutlib.jar" "$DEST/"
 
-    if [ ! -f "$DEST/kxml2-2.3.0.jar" ]; then
-        cp -v "prebuilt/common/kxml2/kxml2-2.3.0.jar" "$DEST/"
-        chmod -v a+rx "$DEST"/*.jar
-    fi
+    chmod -v a+rx "$DEST"/*.jar
 
 else
     echo "Unsupported platform ($HOST). Nothing done."
@@ -49,7 +47,10 @@ fi
 
 # create link to ddmlib tests
 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
 
+DEST=$BASE/unittests/com/android/layoutlib
+mkdir $BASE
+cpdir $DEST frameworks/base/tools/layoutlib/bridge/tests/com/android/layoutlib/bridge
+