diff --git a/Gruntfile.js b/Gruntfile.js
index 24842d0..d6e9e70 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -32,14 +32,20 @@ module.exports = function (grunt) {
             files: ['Gruntfile.js', 'src/**/*.js']
         },
         simplemocha: {
-            all: {
-                src: 'test/**/*.js',
+            node: {
+                src: 'test/node/**/*.js',
                 options: {
                     globals: ['should'],
                     timeout: 3000,
                     ignoreLeaks: false,
                     reporter: 'spec'
                 }
+            },
+            browser: {
+                src: 'test/browser/**/*.js',
+                options: {
+                    reporter: 'spec'
+                }
             }
         }
     });
diff --git a/dist/showdown.js b/dist/showdown.js
index bd29a70..f7f0afd 100644
Binary files a/dist/showdown.js and b/dist/showdown.js differ
diff --git a/test/converter/testMakeHtml.js b/test/node/Container/testMakeHtml.js
similarity index 97%
rename from test/converter/testMakeHtml.js
rename to test/node/Container/testMakeHtml.js
index 9095cef..0918bff 100644
--- a/test/converter/testMakeHtml.js
+++ b/test/node/Container/testMakeHtml.js
@@ -10,7 +10,7 @@
 
     var fs = require('fs'),
         dir = 'test/cases/',
-        showdown = require('../../dist/showdown.js'),
+        showdown = require('../../../dist/showdown.js'),
         converter = new showdown.Converter();
 
     // Load test cases from disk