diff --git a/iso/scripts/automount b/iso/scripts/automount
index 282c7b3..925944f 100755
--- a/iso/scripts/automount
+++ b/iso/scripts/automount
@@ -9,7 +9,7 @@ BOOT2DOCKER_DATA=`blkid -o device -l -t LABEL=$LABEL`
 echo $BOOT2DOCKER_DATA
 if [ ! -n "$BOOT2DOCKER_DATA" ]; then
     echo "Is the disk unpartitioned?, test for the 'boot2docker format-me' string"
-    
+
     # Is the disk unpartitioned?, test for the 'boot2docker format-me' string
     UNPARTITIONED_HD=`fdisk -l | grep "doesn't contain a valid partition table" | head -n 1 | sed 's/Disk \(.*\) doesn.*/\1/'`
 
@@ -124,11 +124,15 @@ if [ -n "$BOOT2DOCKER_DATA" ]; then
     mkdir -p /mnt/$PARTNAME/var/lib/boot2docker
     mkdir -p /var/lib/boot2docker
     mount --bind /mnt/$PARTNAME/var/lib/boot2docker /var/lib/boot2docker
-    
+
     mkdir -p /mnt/$PARTNAME/var/lib/minishift
     mkdir -p /var/lib/minishift
     mount --bind /mnt/$PARTNAME/var/lib/minishift /var/lib/minishift
 
+    mkdir -p /mnt/$PARTNAME/var/lib/origin
+    mkdir -p /var/lib/origin
+    mount --bind /mnt/$PARTNAME/var/lib/origin /var/lib/origin
+
     mkdir -p /mnt/$PARTNAME/data
     ln -s /mnt/$PARTNAME/data /data
 
diff --git a/tests/test.sh b/tests/test.sh
index d14af4c..b340c44 100644
--- a/tests/test.sh
+++ b/tests/test.sh
@@ -100,7 +100,7 @@ function verify_nfs_installation() {
 
 function verify_bind_mount() {
   output=`$BINARY ssh 'mount | grep /dev/sda1 | grep /var/lib/ | wc -l'`
-  assert_equal $output "5"
+  assert_equal $output "6"
   print_success_message "Bind mount check"
 }