diff --git a/notebook/static/base/js/dialog.js b/notebook/static/base/js/dialog.js
index 99d37440e..f6877a935 100644
--- a/notebook/static/base/js/dialog.js
+++ b/notebook/static/base/js/dialog.js
@@ -354,7 +354,7 @@ define(function(require) {
             });
         var dialogform = $('<div/>').attr('title', 'Edit attachments')
             .append(
-                $('<form/>').append(
+                $('<form id="insert-image-form" />').append(
                     $('<fieldset/>').append(
                         $('<label/>')
                         .attr('for','file')
diff --git a/notebook/tests/_testdata/black_square_22.png b/notebook/tests/_testdata/black_square_22.png
new file mode 100644
index 000000000..371f52044
Binary files /dev/null and b/notebook/tests/_testdata/black_square_22.png differ
diff --git a/notebook/tests/notebook/attachments.js b/notebook/tests/notebook/attachments.js
new file mode 100644
index 000000000..dafdeedc8
--- /dev/null
+++ b/notebook/tests/notebook/attachments.js
@@ -0,0 +1,73 @@
+//
+// Test cell attachments
+//
+var fs = require('fs');
+casper.notebook_test(function () {
+    // Test the Edit->Insert Image menu to insert new attachments
+    "use strict";
+    casper.test.info("Testing attachments insertion through the menuitem");
+
+    this.viewport(1024, 768);
+
+    // Click on menuitem
+    var selector = '#insert_image > a';
+    this.waitForSelector(selector);
+    this.thenEvaluate(function(sel) {
+        IPython.notebook.to_markdown();
+        var cell = IPython.notebook.get_selected_cell();
+        cell.set_text("");
+        cell.unrender();
+
+        $(sel).click();
+    }, selector);
+    // Wait for the dialog to be shown
+    this.waitUntilVisible(".modal-body");
+    this.wait(200);
+
+    // Select the image file to insert
+
+    // For some reason, this doesn't seem to work in a reliable way in
+    // phantomjs. So we manually set the input's files attribute
+    //this.page.uploadFile('.modal-body input[name=file]', 'test.png')
+    this.then(function() {
+        var fname = 'notebook/tests/_testdata/black_square_22.png';
+        if (!fs.exists(fname)) {
+            this.test.fail(
+                " does not exist, are you running the tests " +
+                "from the root directory ? "
+            );
+        }
+        this.fill('form#insert-image-form', {'file': fname});
+    });
+
+    // Validate and render the markdown cell
+    this.thenClick('#btn_ok');
+    this.thenEvaluate(function() {
+        IPython.notebook.get_cell(0).render();
+    });
+    this.wait(300);
+    // Check that an <img> tag has been inserted and that it contains the
+    // image
+    this.then(function() {
+        var img = this.evaluate(function() {
+            var cell = IPython.notebook.get_cell(0);
+            var img = $("div.text_cell_render").find("img");
+            return {
+                src: img.attr("src"),
+                width: img.width(),
+                height: img.height(),
+            };
+        });
+        this.test.assertType(img, "object", "Image('image/png')");
+        this.test.assertEquals(img.src.split(',')[0],
+                               "data:image/png;base64",
+                               "Image data-uri prefix");
+        this.test.assertEquals(img.width, 2, "width == 2");
+        this.test.assertEquals(img.height, 2, "height == 2");
+    });
+
+    //this.then(function() {
+        //this.capture('test.png');
+    //});
+});
+