diff --git a/files/pips/openstack-integration-tests b/files/pips/openstack-integration-tests
new file mode 100644
index 0000000..df7f423
--- /dev/null
+++ b/files/pips/openstack-integration-tests
@@ -0,0 +1 @@
+pika
diff --git a/stackrc b/stackrc
index a50835a..854a44c 100644
--- a/stackrc
+++ b/stackrc
@@ -39,6 +39,10 @@ OPENSTACKX_BRANCH=diablo
 QUANTUM_REPO=https://github.com/openstack/quantum
 QUANTUM_BRANCH=stable/diablo
 
+# CI test suite
+CITEST_REPO=https://github.com/openstack/openstack-integration-tests.git
+CITEST_BRANCH=master
+
 # Specify a comma-separated list of uec images to download and install into glance.
 IMAGE_URLS=http://smoser.brickies.net/ubuntu/ttylinux-uec/ttylinux-uec-amd64-11.2_2.6.35-15_1.tar.gz
 
diff --git a/tools/build_ci_config.sh b/tools/build_ci_config.sh
new file mode 100755
index 0000000..9112471
--- /dev/null
+++ b/tools/build_ci_config.sh
@@ -0,0 +1,144 @@
+#!/usr/bin/env bash
+#
+# build_ci_config.sh - Build a config.ini for openstack-integration-tests
+#                      (https://github.com/openstack/openstack-integration-tests)
+
+function usage {
+    echo "$0 - Build config.ini for openstack-integration-tests"
+    echo ""
+    echo "Usage: $0 configfile"
+    exit 1
+}
+
+if [ ! "$#" -eq "1" ]; then
+    usage
+fi
+
+CONFIG_FILE=$1
+
+# Clean up any resources that may be in use
+cleanup() {
+    set +o errexit
+
+    # Mop up temporary files
+    if [ -n "$CONFIG_FILE_TMP" -a -e "$CONFIG_FILE_TMP" ]; then
+        rm -f $CONFIG_FILE_TMP
+    fi
+
+    # Kill ourselves to signal any calling process
+    trap 2; kill -2 $$
+}
+
+trap cleanup SIGHUP SIGINT SIGTERM
+
+# Keep track of the current directory
+TOOLS_DIR=$(cd $(dirname "$0") && pwd)
+TOP_DIR=`cd $TOOLS_DIR/..; pwd`
+
+# Abort if localrc is not set
+if [ ! -e $TOP_DIR/localrc ]; then
+    echo "You must have a localrc with ALL necessary passwords and configuration defined before proceeding."
+    echo "See stack.sh for required passwords."
+    exit 1
+fi
+
+# Source params
+source ./stackrc
+
+# Where Openstack code lives
+DEST=${DEST:-/opt/stack}
+
+DIST_NAME=${DIST_NAME:-oneiric}
+
+# Process network configuration vars
+GUEST_NETWORK=${GUEST_NETWORK:-1}
+GUEST_RECREATE_NET=${GUEST_RECREATE_NET:-yes}
+
+GUEST_IP=${GUEST_IP:-192.168.$GUEST_NETWORK.50}
+GUEST_CIDR=${GUEST_CIDR:-$GUEST_IP/24}
+GUEST_NETMASK=${GUEST_NETMASK:-255.255.255.0}
+GUEST_GATEWAY=${GUEST_GATEWAY:-192.168.$GUEST_NETWORK.1}
+GUEST_MAC=${GUEST_MAC:-"02:16:3e:07:69:`printf '%02X' $GUEST_NETWORK`"}
+GUEST_RAM=${GUEST_RAM:-1524288}
+GUEST_CORES=${GUEST_CORES:-1}
+
+# Use the GUEST_IP unless an explicit IP is set by ``HOST_IP``
+HOST_IP=${HOST_IP:-$GUEST_IP}
+# Use the first IP if HOST_IP still is not set
+if [ ! -n "$HOST_IP" ]; then
+    HOST_IP=`LC_ALL=C /sbin/ifconfig  | grep -m 1 'inet addr:'| cut -d: -f2 | awk '{print $1}'`
+fi
+
+RABBIT_HOST=${RABBIT_HOST:-localhost}
+
+# Glance connection info.  Note the port must be specified.
+GLANCE_HOSTPORT=${GLANCE_HOSTPORT:-$HOST_IP:9292}
+set `echo $GLANCE_HOSTPORT | tr ':' ' '`
+GLANCE_HOST=$1
+GLANCE_PORT=$2
+
+CONFIG_FILE_TMP=$(mktemp $CONFIG_FILE.XXXXXX)
+if [ "$UPLOAD_LEGACY_TTY" ]; then
+    cat >$CONFIG_FILE_TMP <<EOF
+[environment]
+aki_location = $DEST/devstack/files/images/aki-tty/image
+ari_location = $DEST/devstack/files/images/ari-tty/image
+ami_location = $DEST/devstack/files/images/ami-tty/image
+image_ref = 1
+flavor_ref = 1
+EOF
+else
+    cat >$CONFIG_FILE_TMP <<EOF
+[environment]
+aki_location = $DEST/openstack-integration-tests/include/sample_vm/$DIST_NAME-server-cloudimg-amd64-vmlinuz-virtual
+#ari_location = $DEST/openstack-integration-tests/include/sample_vm/$DIST_NAME-server-cloudimg-amd64-loader
+ami_location = $DEST/openstack-integration-tests/include/sample_vm/$DIST_NAME-server-cloudimg-amd64.img
+image_ref = 1
+flavor_ref = 1
+EOF
+fi
+
+cat >>$CONFIG_FILE_TMP <<EOF
+[glance]
+host = $GLANCE_HOST
+apiver = v1
+port = $GLANCE_PORT
+image_id = 1
+tenant_id = 1
+
+[keystone]
+service_host = $HOST_IP
+service_port = 5000
+apiver = v2.0
+user = admin
+password = $ADMIN_PASSWORD
+tenant_id = 1
+
+[nova]
+host = $HOST_IP
+port = 8774
+apiver = v1.1
+project = admin
+user = admin
+key = $ADMIN_PASSWORD
+ssh_timeout = 300
+build_timeout = 300
+flavor_ref = 1
+flavor_ref_alt = 2
+
+[rabbitmq]
+host = $RABBIT_HOST
+user = guest
+password = $RABBIT_PASSWORD
+
+[swift]
+auth_host = $HOST_IP
+auth_port = 443
+auth_prefix = /auth/
+auth_ssl = yes
+account = system
+username = root
+password = password
+
+EOF
+mv $CONFIG_FILE_TMP $CONFIG_FILE
diff --git a/tools/build_libvirt.sh b/tools/build_libvirt.sh
index d192879..585f5af 100755
--- a/tools/build_libvirt.sh
+++ b/tools/build_libvirt.sh
@@ -17,6 +17,11 @@ cleanup() {
     set +o errexit
     unmount_images
 
+    if [ -n "$COPY_DIR" ]; then
+        umount $COPY_DIR/dev
+        umount $COPY_DIR
+    fi
+
     if [ -n "$ROOTFS" ]; then
         umount $ROOTFS/dev
         umount $ROOTFS
@@ -31,7 +36,7 @@ cleanup() {
     trap 2; kill -2 $$
 }
 
-trap cleanup SIGHUP SIGINT SIGTERM
+trap cleanup SIGHUP SIGINT SIGTERM SIGQUIT EXIT
 
 # Echo commands
 set -o xtrace
@@ -127,6 +132,7 @@ DEST=${DEST:-/opt/stack}
 # Mount the file system
 # For some reason, UEC-based images want 255 heads * 63 sectors * 512 byte sectors = 8225280
 mount -t ext4 -o loop,offset=8225280 $VM_IMAGE $COPY_DIR
+mount -o bind /dev $COPY_DIR/dev
 
 # git clone only if directory doesn't exist already.  Since ``DEST`` might not
 # be owned by the installation user, we create the directory and change the
@@ -149,6 +155,8 @@ chroot $COPY_DIR apt-get install -y --download-only `cat files/apts/* | grep NOP
 chroot $COPY_DIR apt-get install -y --force-yes `cat files/apts/* | grep -v NOPRIME | cut -d\# -f1`
 chroot $COPY_DIR pip install `cat files/pips/*`
 
+umount $COPY_DIR/dev
+
 # Clean out code repos if directed to do so
 if [ "$CLEAN" = "1" ]; then
     rm -rf $COPY_DIR/$DEST
@@ -165,6 +173,18 @@ git_clone $NOVACLIENT_REPO $COPY_DIR/$DEST/python-novaclient $NOVACLIENT_BRANCH
 git_clone $OPENSTACKX_REPO $COPY_DIR/$DEST/openstackx $OPENSTACKX_BRANCH
 git_clone $KEYSTONE_REPO $COPY_DIR/$DEST/keystone $KEYSTONE_BRANCH
 git_clone $NOVNC_REPO $COPY_DIR/$DEST/noVNC $NOVNC_BRANCH
+git_clone $CITEST_REPO $COPY_DIR/$DEST/openstack-integration-tests $CITEST_BRANCH
+
+if [ -z "$UPLOAD_LEGACY_TTY" =; then
+    # Pre-load an image for testing
+    UEC_NAME=$DIST_NAME-server-cloudimg-amd64
+    CIVMDIR=${COPY_DIR}${DEST}/openstack-integration-tests/include/sample_vm
+    if [ ! -e $CIVMDIR/$UEC_NAME.tar.gz ]; then
+        mkdir -p $CIVMDIR
+        (cd $CIVMDIR && wget -N http://uec-images.ubuntu.com/$DIST_NAME/current/$UEC_NAME.tar.gz;
+            tar xzf $UEC_NAME.tar.gz;)
+    fi
+fi
 
 # Back to devstack
 cd $TOP_DIR
@@ -403,18 +423,20 @@ echo 'GRUB_DISABLE_OS_PROBER=true' >>$ROOTFS/etc/default/grub
 echo "GRUB_DEVICE_UUID=$G_DEV_UUID" >>$ROOTFS/etc/default/grub
 
 chroot $ROOTFS update-grub
-umount $ROOTFS/dev
 
 # Pre-generate ssh host keys and allow password login
 chroot $ROOTFS dpkg-reconfigure openssh-server
 sed -e 's/^PasswordAuthentication.*$/PasswordAuthentication yes/' -i $ROOTFS/etc/ssh/sshd_config
 
 # Unmount
+umount $ROOTFS/dev
 umount $ROOTFS || echo 'ok'
 ROOTFS=""
 qemu-nbd -d $NBD
 NBD=""
 
+trap - SIGHUP SIGINT SIGTERM SIGQUIT EXIT
+
 # Create the instance
 cd $VM_DIR && virsh create libvirt.xml