diff --git a/webapp/tests/formatting_imgs.test.jsx b/webapp/tests/formatting_imgs.test.jsx
new file mode 100644
index 0000000000..604472671c
--- /dev/null
+++ b/webapp/tests/formatting_imgs.test.jsx
@@ -0,0 +1,55 @@
+// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+import assert from 'assert';
+
+import * as Markdown from 'utils/markdown.jsx';
+
+describe('Markdown.Imgs', function() {
+ this.timeout(10000);
+
+ it('Inline mage', function(done) {
+ assert.equal(
+ Markdown.format('').trim(),
+ '

'
+ );
+
+ done();
+ });
+
+ it('Image with hover text', function(done) {
+ assert.equal(
+ Markdown.format('').trim(),
+ '
'
+ );
+
+ done();
+ });
+
+ it('Image with link', function(done) {
+ assert.equal(
+ Markdown.format('[](https://github.com/mattermost/platform)').trim(),
+ '
'
+ );
+
+ done();
+ });
+
+ it('Image with width and height', function(done) {
+ assert.equal(
+ Markdown.format('').trim(),
+ '
'
+ );
+
+ done();
+ });
+
+ it('Image with width', function(done) {
+ assert.equal(
+ Markdown.format('').trim(),
+ '
'
+ );
+
+ done();
+ });
+});