diff --git a/scripts/run b/scripts/run
index 1eaeb9e5..c7d433f5 100755
--- a/scripts/run
+++ b/scripts/run
@@ -71,6 +71,10 @@ while [ "$#" -gt 0 ]; do
         --fresh)
             FRESH=1
             ;;
+        --b2d)
+            # use together with --fresh to trigger boot2docker/machine auto-format
+            AUTOFORMAT=1
+            ;;
         --console)
 	    # use the bios console, not serial (lets you see syslinux)
             CONSOLEDISPLAY=1
@@ -127,7 +131,13 @@ if [ "$QEMU" == "1" ] || [ "$BOOT_ISO" == "1" ] || [ "$BOOT_HD" == "1" ]; then
         if [ ¨$INSTALLED¨ == ¨1¨ ]; then
             ./scripts/create-installed
         else
+		if [ "$AUTOFORMAT" == "1" ]; then
+			echo "boot2docker, please format-me" | cat - /dev/zero | head -c 5242880 > format-flag.txt # 5M
+		    qemu-img convert -f raw format-flag.txt -O qcow2 ${HD}
+            qemu-img resize ${HD} +10GB
+		else
         	qemu-img create -f qcow2 -o size=10G ${HD}
+		fi
         fi
     fi
 
diff --git a/tests/boot2docker_autoformat_test.go b/tests/boot2docker_autoformat_test.go
new file mode 100755
index 00000000..9fc35cb7
--- /dev/null
+++ b/tests/boot2docker_autoformat_test.go
@@ -0,0 +1,22 @@
+package integration
+
+import . "gopkg.in/check.v1"
+
+func (s *QemuSuite) TestBoot2DockerState(c *C) {
+	s.RunQemu(c, "--fresh", "--b2d")
+	s.CheckCall(c, "blkid | grep B2D_STATE")
+	// And once I make run create a tar file, check that its untarred in the docker user's home dir
+	// And confirm if it should add to the dir, or replace, i can't remember
+}
+
+func (s *QemuSuite) TestIsoBoot2DockerState(c *C) {
+	s.RunQemu(c, "--fresh", "--b2d", "--iso")
+	s.CheckCall(c, "blkid | grep B2D_STATE")
+	// And once I make run create a tar file, check that its untarred in the docker user's home dir
+	// And confirm if it should add to the dir, or replace, i can't remember
+}
+
+func (s *QemuSuite) TestRancherOSState(c *C) {
+	s.RunQemu(c, "--fresh")
+	s.CheckCall(c, "blkid | grep RANCHER_STATE")
+}