diff --git a/build_library/test_image_util.sh b/build_library/test_image_util.sh
index dcbc6e0..c380498 100755
--- a/build_library/test_image_util.sh
+++ b/build_library/test_image_util.sh
@@ -14,7 +14,7 @@
   local root_dev_dir="${root_fs_dir}/usr/local"
 
   emerge_to_image --root="${root_fs_dir}" chromeos-test-root
-  emerge_to_image --root="${root_dev_dir}" chromeos-test
+  emerge_to_image --root="${root_dev_dir}" virtual/target-os-test
 }
 
 # Converts a dev image into a test or factory test image
diff --git a/build_packages b/build_packages
index 8b3702d..f4901fc 100755
--- a/build_packages
+++ b/build_packages
@@ -208,7 +208,7 @@
     PACKAGES+=( chromeos-base/autotest-factory-install )
   fi
   if [[ "${FLAGS_withtest}" -eq "${FLAGS_TRUE}" ]]; then
-    PACKAGES+=( chromeos-base/chromeos-test )
+    PACKAGES+=( virtual/target-os-test )
   fi
   if [[ "${FLAGS_withautotest}" -eq "${FLAGS_TRUE}" ]]; then
     PACKAGES+=( chromeos-base/autotest-all )