diff --git a/test/export.c b/test/export.c
index 092ba86..38854b5 100644
--- a/test/export.c
+++ b/test/export.c
@@ -34,71 +34,104 @@ int main(int argc, char *argv[])
     cucul_canvas_t *cv;
     cucul_dither_t *dither;
     cucul_buffer_t *buffer;
+    char *file, *format;
     char const * const * exports, * const * p;
     int x, y;
 
     exports = cucul_get_export_list();
 
-    if(argc != 2)
+    if(argc < 2 || argc > 3)
     {
         fprintf(stderr, "%s: wrong argument count\n", argv[0]);
-        fprintf(stderr, "usage: %s <format>\n", argv[0]);
+        fprintf(stderr, "usage: %s [file] <format>\n", argv[0]);
         fprintf(stderr, "where <format> is one of:\n");
         for(p = exports; *p; p += 2)
             fprintf(stderr, " \"%s\" (%s)\n", *p, *(p + 1));
         exit(-1);
     }
 
+    if(argc == 2)
+    {
+        file = NULL;
+        format = argv[1];
+    }
+    else
+    {
+        file = argv[1];
+        format = argv[2];
+    }
+
     for(p = exports; *p; p += 2)
-        if(!strcasecmp(argv[1], *p))
+        if(!strcasecmp(format, *p))
             break;
 
     if(!*p)
     {
-        fprintf(stderr, "%s: unknown format `%s'\n", argv[0], argv[1]);
+        fprintf(stderr, "%s: unknown format `%s'\n", argv[0], format);
         fprintf(stderr, "please use one of:\n");
         for(p = exports; *p; p += 2)
             fprintf(stderr, " \"%s\" (%s)\n", *p, *(p + 1));
         exit(-1);
     }
 
-    cv = cucul_create_canvas(WIDTH, HEIGHT);
-
-    for(y = 0; y < 256; y++)
+    if(file)
     {
-        for(x = 0; x < 256; x++)
+        cucul_buffer_t *tmp;
+        tmp = cucul_load_file(file);
+        if(!tmp)
+        {
+            fprintf(stderr, "%s: could not load `%s'\n", argv[0], file);
+            exit(-1);
+        }
+        cv = cucul_import_canvas(tmp, "");
+        if(!tmp)
         {
-            uint32_t r = x;
-            uint32_t g = (255 - y + x) / 2;
-            uint32_t b = y * (255 - x) / 256;
-            pixels[y * 256 + x] = (r << 16) | (g << 8) | (b << 0);
+            fprintf(stderr, "%s: `%s' has unknown format\n", argv[0], file);
+            exit(-1);
         }
+        cucul_free_buffer(tmp);
     }
+    else
+    {
+        cv = cucul_create_canvas(WIDTH, HEIGHT);
 
-    dither = cucul_create_dither(32, 256, 256, 4 * 256,
-                                 0x00ff0000, 0x0000ff00, 0x000000ff, 0x0);
-    cucul_dither_bitmap(cv, 0, 0, cucul_get_canvas_width(cv),
-                        cucul_get_canvas_height(cv), dither, pixels);
-    cucul_free_dither(dither);
+        for(y = 0; y < 256; y++)
+        {
+            for(x = 0; x < 256; x++)
+            {
+                uint32_t r = x;
+                uint32_t g = (255 - y + x) / 2;
+                uint32_t b = y * (255 - x) / 256;
+                pixels[y * 256 + x] = (r << 16) | (g << 8) | (b << 0);
+            }
+        }
 
-    cucul_set_color(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLACK);
-    cucul_draw_thin_box(cv, 0, 0, WIDTH - 1, HEIGHT - 1);
+        dither = cucul_create_dither(32, 256, 256, 4 * 256,
+                                     0x00ff0000, 0x0000ff00, 0x000000ff, 0x0);
+        cucul_dither_bitmap(cv, 0, 0, cucul_get_canvas_width(cv),
+                            cucul_get_canvas_height(cv), dither, pixels);
+        cucul_free_dither(dither);
 
-    cucul_set_color(cv, CUCUL_COLOR_BLACK, CUCUL_COLOR_WHITE);
-    cucul_fill_ellipse(cv, WIDTH / 2, HEIGHT / 2, WIDTH / 4, HEIGHT / 4, " ");
-    cucul_putstr(cv, WIDTH / 2 - 5, HEIGHT / 2 - 2, "(\") \\o/ <&>");
-    cucul_putstr(cv, WIDTH / 2 - 7, HEIGHT / 2 + 2, "äβç ░▒▓█▓▒░ ΔЗҒ");
+        cucul_set_color(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLACK);
+        cucul_draw_thin_box(cv, 0, 0, WIDTH - 1, HEIGHT - 1);
 
-    cucul_set_color(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_LIGHTBLUE);
-    cucul_putstr(cv, WIDTH / 2 - 7, HEIGHT / 2, "    LIBCACA    ");
+        cucul_set_color(cv, CUCUL_COLOR_BLACK, CUCUL_COLOR_WHITE);
+        cucul_fill_ellipse(cv, WIDTH / 2, HEIGHT / 2,
+                               WIDTH / 4, HEIGHT / 4, " ");
+        cucul_putstr(cv, WIDTH / 2 - 5, HEIGHT / 2 - 2, "(\") \\o/ <&>");
+        cucul_putstr(cv, WIDTH / 2 - 7, HEIGHT / 2 + 2, "äβç ░▒▓█▓▒░ ΔЗҒ");
 
-    for(x = 0; x < 16; x++)
-    {
-        cucul_set_truecolor(cv, 0xff00 | x, 0xf00f | (x << 4));
-        cucul_putstr(cv, WIDTH / 2 - 7 + x, HEIGHT / 2 + 5, "#");
+        cucul_set_color(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_LIGHTBLUE);
+        cucul_putstr(cv, WIDTH / 2 - 7, HEIGHT / 2, "    LIBCACA    ");
+
+        for(x = 0; x < 16; x++)
+        {
+            cucul_set_truecolor(cv, 0xff00 | x, 0xf00f | (x << 4));
+            cucul_putstr(cv, WIDTH / 2 - 7 + x, HEIGHT / 2 + 5, "#");
+        }
     }
 
-    buffer = cucul_export_canvas(cv, argv[1]);
+    buffer = cucul_export_canvas(cv, format);
     fwrite(cucul_get_buffer_data(buffer),
            cucul_get_buffer_size(buffer), 1, stdout);
     cucul_free_buffer(buffer);