diff --git a/envsetup.sh b/envsetup.sh
index fa4e2d69f0..fcf3b47e59 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -183,7 +183,7 @@ function setpaths()
     fi
 
     export PATH=$ANDROID_BUILD_PATHS$PATH
-    export PYTHONPATH=$T/system/core:$PYTHONPATH
+    export PYTHONPATH=$T/development/python-packages:$PYTHONPATH
 
     unset ANDROID_JAVA_TOOLCHAIN
     unset ANDROID_PRE_BUILD_PATHS