diff --git a/build_library/dev_image_util.sh b/build_library/dev_image_util.sh
index e46f57b..d80a099 100755
--- a/build_library/dev_image_util.sh
+++ b/build_library/dev_image_util.sh
@@ -22,6 +22,9 @@
   # Determine the root dir for developer packages.
   local root_dev_dir="${ROOT_FS_DIR}/usr/local"
 
+  # Install dev-specific init scripts into / from chromeos-dev-init.
+  emerge_to_image --root="${ROOT_FS_DIR}" chromeos-dev-init
+
   # Install developer packages described in chromeos-dev.
   emerge_to_image --root="${root_dev_dir}" chromeos-dev
 
diff --git a/build_library/test_image_util.sh b/build_library/test_image_util.sh
index 4173451..112114c 100755
--- a/build_library/test_image_util.sh
+++ b/build_library/test_image_util.sh
@@ -77,6 +77,7 @@
   # Determine the root dir for test packages.
   local root_dev_dir="${ROOT_FS_DIR}/usr/local"
 
+  emerge_to_image --root="${ROOT_FS_DIR}" chromeos-test-init
   emerge_to_image --root="${root_dev_dir}" chromeos-test
 }
 
diff --git a/build_packages b/build_packages
index 6802291..49365c4 100755
--- a/build_packages
+++ b/build_packages
@@ -155,6 +155,7 @@
   PACKAGES=( chromeos-base/chromeos )
   if [[ "${FLAGS_withdev}" -eq "${FLAGS_TRUE}" ]]; then
     PACKAGES+=( chromeos-base/chromeos-dev )
+    PACKAGES+=( chromeos-base/chromeos-dev-init )
   fi
   if [[ "${FLAGS_withfactory}" -eq "${FLAGS_TRUE}" ]]; then
     PACKAGES+=( chromeos-base/chromeos-factory )
@@ -164,6 +165,7 @@
   fi
   if [[ "${FLAGS_withtest}" -eq "${FLAGS_TRUE}" ]]; then
     PACKAGES+=( chromeos-base/chromeos-test )
+    PACKAGES+=( chromeos-base/chromeos-test-init )
   fi
   if [[ "${FLAGS_withautotest}" -eq "${FLAGS_TRUE}" ]]; then
     PACKAGES+=( chromeos-base/autotest-all )
diff --git a/mod_for_test_scripts/400modifyUpstart b/mod_for_test_scripts/400modifyUpstart
deleted file mode 100755
index b9fecde..0000000
--- a/mod_for_test_scripts/400modifyUpstart
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-echo "Modifying upstart scripts for test accessibility."
-for script in "${ROOT_FS_DIR}/etc/init/*.conf"; do
-    sed -i 's/#for_test //' ${script}
-done
-
diff --git a/mod_for_test_scripts/900mountHomeExec b/mod_for_test_scripts/900mountHomeExec
deleted file mode 100755
index bc60967..0000000
--- a/mod_for_test_scripts/900mountHomeExec
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# Create a marker file indicating that we are in mod_for_test
-echo "Setting /home to be mounted exec"
-sed -i -e 's/#mod_for_test#//g' ${ROOT_FS_DIR}/sbin/chromeos_startup