diff --git a/scikits/image/data/chessboard_GRAY_U8.npz b/scikits/image/data/chessboard_GRAY_U8.npz
new file mode 100644
index 00000000..5ec77921
Binary files /dev/null and b/scikits/image/data/chessboard_GRAY_U8.npz differ
diff --git a/scikits/image/data/chessboard_RGB_U8.npz b/scikits/image/data/chessboard_RGB_U8.npz
new file mode 100644
index 00000000..188f42b4
Binary files /dev/null and b/scikits/image/data/chessboard_RGB_U8.npz differ
diff --git a/scikits/image/data/cvCalibrateCamera2TestData.npz b/scikits/image/data/cvCalibrateCamera2TestData.npz
new file mode 100644
index 00000000..effe2842
Binary files /dev/null and b/scikits/image/data/cvCalibrateCamera2TestData.npz differ
diff --git a/scikits/image/data/cvCalibrateCamera2TestData.pck b/scikits/image/data/cvCalibrateCamera2TestData.pck
deleted file mode 100644
index f728ce43..00000000
Binary files a/scikits/image/data/cvCalibrateCamera2TestData.pck and /dev/null differ
diff --git a/scikits/image/data/diamond-bothat-matlab-output.npy b/scikits/image/data/diamond-bothat-matlab-output.npy
deleted file mode 100644
index 9dea4c83..00000000
Binary files a/scikits/image/data/diamond-bothat-matlab-output.npy and /dev/null differ
diff --git a/scikits/image/data/diamond-bothat-matlab-output.npz b/scikits/image/data/diamond-bothat-matlab-output.npz
new file mode 100644
index 00000000..1b0a65dd
Binary files /dev/null and b/scikits/image/data/diamond-bothat-matlab-output.npz differ
diff --git a/scikits/image/data/diamond-close-matlab-output.npy b/scikits/image/data/diamond-close-matlab-output.npy
deleted file mode 100644
index 75ce1fdb..00000000
Binary files a/scikits/image/data/diamond-close-matlab-output.npy and /dev/null differ
diff --git a/scikits/image/data/diamond-close-matlab-output.npz b/scikits/image/data/diamond-close-matlab-output.npz
new file mode 100644
index 00000000..4f39c48c
Binary files /dev/null and b/scikits/image/data/diamond-close-matlab-output.npz differ
diff --git a/scikits/image/data/diamond-dilate-matlab-output.npy b/scikits/image/data/diamond-dilate-matlab-output.npy
deleted file mode 100644
index 035de9b6..00000000
Binary files a/scikits/image/data/diamond-dilate-matlab-output.npy and /dev/null differ
diff --git a/scikits/image/data/diamond-dilate-matlab-output.npz b/scikits/image/data/diamond-dilate-matlab-output.npz
new file mode 100644
index 00000000..f79d9a44
Binary files /dev/null and b/scikits/image/data/diamond-dilate-matlab-output.npz differ
diff --git a/scikits/image/data/diamond-erode-matlab-output.npy b/scikits/image/data/diamond-erode-matlab-output.npy
deleted file mode 100644
index 8ba96637..00000000
Binary files a/scikits/image/data/diamond-erode-matlab-output.npy and /dev/null differ
diff --git a/scikits/image/data/diamond-erode-matlab-output.npz b/scikits/image/data/diamond-erode-matlab-output.npz
new file mode 100644
index 00000000..3b034cb4
Binary files /dev/null and b/scikits/image/data/diamond-erode-matlab-output.npz differ
diff --git a/scikits/image/data/diamond-matlab-output.npy b/scikits/image/data/diamond-matlab-output.npy
deleted file mode 100644
index bfb2030e..00000000
Binary files a/scikits/image/data/diamond-matlab-output.npy and /dev/null differ
diff --git a/scikits/image/data/diamond-matlab-output.npz b/scikits/image/data/diamond-matlab-output.npz
new file mode 100644
index 00000000..e59caa70
Binary files /dev/null and b/scikits/image/data/diamond-matlab-output.npz differ
diff --git a/scikits/image/data/diamond-open-matlab-output.npy b/scikits/image/data/diamond-open-matlab-output.npy
deleted file mode 100644
index a3f7b0f9..00000000
Binary files a/scikits/image/data/diamond-open-matlab-output.npy and /dev/null differ
diff --git a/scikits/image/data/diamond-open-matlab-output.npz b/scikits/image/data/diamond-open-matlab-output.npz
new file mode 100644
index 00000000..143fcd4d
Binary files /dev/null and b/scikits/image/data/diamond-open-matlab-output.npz differ
diff --git a/scikits/image/data/diamond-tophat-matlab-output.npy b/scikits/image/data/diamond-tophat-matlab-output.npy
deleted file mode 100644
index 03ce6bbc..00000000
Binary files a/scikits/image/data/diamond-tophat-matlab-output.npy and /dev/null differ
diff --git a/scikits/image/data/diamond-tophat-matlab-output.npz b/scikits/image/data/diamond-tophat-matlab-output.npz
new file mode 100644
index 00000000..eb5cd8c1
Binary files /dev/null and b/scikits/image/data/diamond-tophat-matlab-output.npz differ
diff --git a/scikits/image/data/disk-bothat-matlab-output.npy b/scikits/image/data/disk-bothat-matlab-output.npy
deleted file mode 100644
index 3f6d1669..00000000
Binary files a/scikits/image/data/disk-bothat-matlab-output.npy and /dev/null differ
diff --git a/scikits/image/data/disk-bothat-matlab-output.npz b/scikits/image/data/disk-bothat-matlab-output.npz
new file mode 100644
index 00000000..352a8d76
Binary files /dev/null and b/scikits/image/data/disk-bothat-matlab-output.npz differ
diff --git a/scikits/image/data/disk-close-matlab-output.npy b/scikits/image/data/disk-close-matlab-output.npy
deleted file mode 100644
index e326ad33..00000000
Binary files a/scikits/image/data/disk-close-matlab-output.npy and /dev/null differ
diff --git a/scikits/image/data/disk-close-matlab-output.npz b/scikits/image/data/disk-close-matlab-output.npz
new file mode 100644
index 00000000..2e76e8e6
Binary files /dev/null and b/scikits/image/data/disk-close-matlab-output.npz differ
diff --git a/scikits/image/data/disk-dilate-matlab-output.npy b/scikits/image/data/disk-dilate-matlab-output.npy
deleted file mode 100644
index d60973e1..00000000
Binary files a/scikits/image/data/disk-dilate-matlab-output.npy and /dev/null differ
diff --git a/scikits/image/data/disk-dilate-matlab-output.npz b/scikits/image/data/disk-dilate-matlab-output.npz
new file mode 100644
index 00000000..9b7a5577
Binary files /dev/null and b/scikits/image/data/disk-dilate-matlab-output.npz differ
diff --git a/scikits/image/data/disk-erode-matlab-output.npy b/scikits/image/data/disk-erode-matlab-output.npy
deleted file mode 100644
index 03e031f9..00000000
Binary files a/scikits/image/data/disk-erode-matlab-output.npy and /dev/null differ
diff --git a/scikits/image/data/disk-erode-matlab-output.npz b/scikits/image/data/disk-erode-matlab-output.npz
new file mode 100644
index 00000000..43c6606d
Binary files /dev/null and b/scikits/image/data/disk-erode-matlab-output.npz differ
diff --git a/scikits/image/data/disk-matlab-output.npy b/scikits/image/data/disk-matlab-output.npy
deleted file mode 100644
index ba00ed00..00000000
Binary files a/scikits/image/data/disk-matlab-output.npy and /dev/null differ
diff --git a/scikits/image/data/disk-matlab-output.npz b/scikits/image/data/disk-matlab-output.npz
new file mode 100644
index 00000000..5ea8f5ba
Binary files /dev/null and b/scikits/image/data/disk-matlab-output.npz differ
diff --git a/scikits/image/data/disk-open-matlab-output.npy b/scikits/image/data/disk-open-matlab-output.npy
deleted file mode 100644
index 97ef778b..00000000
Binary files a/scikits/image/data/disk-open-matlab-output.npy and /dev/null differ
diff --git a/scikits/image/data/disk-open-matlab-output.npz b/scikits/image/data/disk-open-matlab-output.npz
new file mode 100644
index 00000000..fcfc652f
Binary files /dev/null and b/scikits/image/data/disk-open-matlab-output.npz differ
diff --git a/scikits/image/data/disk-tophat-matlab-output.npy b/scikits/image/data/disk-tophat-matlab-output.npy
deleted file mode 100644
index 2cab1cb6..00000000
Binary files a/scikits/image/data/disk-tophat-matlab-output.npy and /dev/null differ
diff --git a/scikits/image/data/disk-tophat-matlab-output.npz b/scikits/image/data/disk-tophat-matlab-output.npz
new file mode 100644
index 00000000..1e104c2e
Binary files /dev/null and b/scikits/image/data/disk-tophat-matlab-output.npz differ
diff --git a/scikits/image/data/lena_GRAY_U8.npz b/scikits/image/data/lena_GRAY_U8.npz
new file mode 100644
index 00000000..b3ca94c6
Binary files /dev/null and b/scikits/image/data/lena_GRAY_U8.npz differ
diff --git a/scikits/image/data/lena_RGB_U8.npz b/scikits/image/data/lena_RGB_U8.npz
new file mode 100644
index 00000000..d822fd93
Binary files /dev/null and b/scikits/image/data/lena_RGB_U8.npz differ