diff --git a/pkg/extend/extend.go b/pkg/extend/extend.go
index afde7462a..bd348cdcf 100644
--- a/pkg/extend/extend.go
+++ b/pkg/extend/extend.go
@@ -82,6 +82,11 @@ func extend(d, fsType string) error {
 		return fmt.Errorf("Unable to unmarshal partition table from sfdisk: %v", err)
 	}
 
+	if len(f.PartitionTable.Partitions) == 0 {
+		log.Printf("Disk %s has no partitions. Skipping", d)
+		return nil
+	}
+
 	if len(f.PartitionTable.Partitions) > 1 {
 		log.Printf("Disk %s has more than 1 partition. Skipping", d)
 		return nil
diff --git a/test/cases/040_packages/005_extend/000_ext4/test.yml b/test/cases/040_packages/005_extend/000_ext4/test.yml
index 2b579779b..b4016a0ae 100644
--- a/test/cases/040_packages/005_extend/000_ext4/test.yml
+++ b/test/cases/040_packages/005_extend/000_ext4/test.yml
@@ -6,7 +6,7 @@ init:
   - linuxkit/runc:8b5af3365fc7d015db4e44113d93c7b1f8e2d2ab
 onboot:
   - name: extend
-    image: linuxkit/extend:9fa90cc4ba8c261b8eb5adacda71feb2f60d75e3
+    image: linuxkit/extend:4fe799316df0f29a6930a5363841057d7c55484b
   - name: mount
     image: linuxkit/mount:2a507ef30302693682f9f612289028df00c58ac5
     command: ["/usr/bin/mountie", "/var/lib/docker"]
diff --git a/test/cases/040_packages/005_extend/001_btrfs/test.yml b/test/cases/040_packages/005_extend/001_btrfs/test.yml
index 95f721173..d84822766 100644
--- a/test/cases/040_packages/005_extend/001_btrfs/test.yml
+++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml
@@ -9,7 +9,7 @@ onboot:
     image: linuxkit/modprobe:fad39ef443853ef02520052cdbf6acbeb4ec7799
     command: ["modprobe", "btrfs"]
   - name: extend
-    image: linuxkit/extend:9fa90cc4ba8c261b8eb5adacda71feb2f60d75e3
+    image: linuxkit/extend:4fe799316df0f29a6930a5363841057d7c55484b
     command: ["/usr/bin/extend", "-type", "btrfs"]
   - name: mount
     image: linuxkit/mount:2a507ef30302693682f9f612289028df00c58ac5
diff --git a/test/cases/040_packages/005_extend/002_xfs/test.yml b/test/cases/040_packages/005_extend/002_xfs/test.yml
index cfa50d1bb..59a48c6d7 100644
--- a/test/cases/040_packages/005_extend/002_xfs/test.yml
+++ b/test/cases/040_packages/005_extend/002_xfs/test.yml
@@ -6,7 +6,7 @@ init:
   - linuxkit/runc:8b5af3365fc7d015db4e44113d93c7b1f8e2d2ab
 onboot:
   - name: extend
-    image: linuxkit/extend:9fa90cc4ba8c261b8eb5adacda71feb2f60d75e3
+    image: linuxkit/extend:4fe799316df0f29a6930a5363841057d7c55484b
     command: ["/usr/bin/extend", "-type", "xfs"]
   - name: mount
     image: linuxkit/mount:2a507ef30302693682f9f612289028df00c58ac5
diff --git a/test/cases/040_packages/005_extend/003_gpt/test.yml b/test/cases/040_packages/005_extend/003_gpt/test.yml
index 2b579779b..b4016a0ae 100644
--- a/test/cases/040_packages/005_extend/003_gpt/test.yml
+++ b/test/cases/040_packages/005_extend/003_gpt/test.yml
@@ -6,7 +6,7 @@ init:
   - linuxkit/runc:8b5af3365fc7d015db4e44113d93c7b1f8e2d2ab
 onboot:
   - name: extend
-    image: linuxkit/extend:9fa90cc4ba8c261b8eb5adacda71feb2f60d75e3
+    image: linuxkit/extend:4fe799316df0f29a6930a5363841057d7c55484b
   - name: mount
     image: linuxkit/mount:2a507ef30302693682f9f612289028df00c58ac5
     command: ["/usr/bin/mountie", "/var/lib/docker"]