diff --git a/test/convert_test.jl b/test/convert_test.jl
index 48504e1..40f5e6a 100644
--- a/test/convert_test.jl
+++ b/test/convert_test.jl
@@ -15,3 +15,15 @@ convert_test("chunk_options.jmd")
 convert_test("chunk_options.jl")
 convert_test("chunk_options.mdw")
 convert_test("chunk_options.ipynb")
+
+function convert_test_nb(outfile)
+  outfile = joinpath("documents/convert", outfile)
+  infile = "documents/chunk_options.ipynb"
+  convert_doc(infile, outfile)
+  result =  readstring(open(outfile))
+  ref =  readstring(open(outfile * ".ref"))
+  rm(outfile)
+  @test result == ref
+end
+
+convert_test_nb("chunk_options_nb.mdw")
diff --git a/test/documents/chunk_options.ipynb b/test/documents/chunk_options.ipynb
new file mode 100644
index 0000000..177dcbd
--- /dev/null
+++ b/test/documents/chunk_options.ipynb
@@ -0,0 +1,179 @@
+{
+  "cells": [
+    {
+      "cell_type": "markdown",
+      "source": [
+        ""
+      ],
+      "metadata": {}
+    },
+    {
+      "outputs": [],
+      "cell_type": "code",
+      "source": [
+        "y= [2, 5, 12]"
+      ],
+      "metadata": {},
+      "execution_count": null
+    },
+    {
+      "cell_type": "markdown",
+      "source": [
+        ""
+      ],
+      "metadata": {}
+    },
+    {
+      "outputs": [],
+      "cell_type": "code",
+      "source": [
+        "x = [12, 10]\nprintln(y)\nprintln(x)"
+      ],
+      "metadata": {},
+      "execution_count": null
+    },
+    {
+      "cell_type": "markdown",
+      "source": [
+        ""
+      ],
+      "metadata": {}
+    },
+    {
+      "outputs": [],
+      "cell_type": "code",
+      "source": [
+        "println(\"Results without code\")\nprintln(x)"
+      ],
+      "metadata": {},
+      "execution_count": null
+    },
+    {
+      "cell_type": "markdown",
+      "source": [
+        ""
+      ],
+      "metadata": {}
+    },
+    {
+      "outputs": [],
+      "cell_type": "code",
+      "source": [
+        "y = randn(5)\nprintln(\"Don't eval, but show code\")"
+      ],
+      "metadata": {},
+      "execution_count": null
+    },
+    {
+      "cell_type": "markdown",
+      "source": [
+        ""
+      ],
+      "metadata": {}
+    },
+    {
+      "outputs": [],
+      "cell_type": "code",
+      "source": [
+        "y = 1:5\nprintln(y)"
+      ],
+      "metadata": {},
+      "execution_count": null
+    },
+    {
+      "cell_type": "markdown",
+      "source": [
+        ""
+      ],
+      "metadata": {}
+    },
+    {
+      "outputs": [],
+      "cell_type": "code",
+      "source": [
+        "a = \"Don't print me\"\nprintln(a)"
+      ],
+      "metadata": {},
+      "execution_count": null
+    },
+    {
+      "cell_type": "markdown",
+      "source": [
+        ""
+      ],
+      "metadata": {}
+    },
+    {
+      "outputs": [],
+      "cell_type": "code",
+      "source": [
+        "println(\"No markup for results.\")"
+      ],
+      "metadata": {},
+      "execution_count": null
+    },
+    {
+      "cell_type": "markdown",
+      "source": [
+        "Test wrapping:"
+      ],
+      "metadata": {}
+    },
+    {
+      "outputs": [],
+      "cell_type": "code",
+      "source": [
+        "println(collect(0:10:1000))"
+      ],
+      "metadata": {},
+      "execution_count": null
+    },
+    {
+      "cell_type": "markdown",
+      "source": [
+        ""
+      ],
+      "metadata": {}
+    },
+    {
+      "outputs": [],
+      "cell_type": "code",
+      "source": [
+        "println(collect(0:10:1000))"
+      ],
+      "metadata": {},
+      "execution_count": null
+    },
+    {
+      "cell_type": "markdown",
+      "source": [
+        ""
+      ],
+      "metadata": {}
+    },
+    {
+      "outputs": [],
+      "cell_type": "code",
+      "source": [
+        "println(collect(0:10:1000))"
+      ],
+      "metadata": {},
+      "execution_count": null
+    }
+  ],
+  "nbformat_minor": 2,
+  "metadata": {
+    "language_info": {
+      "file_extension": ".jl",
+      "mimetype": "application/julia",
+      "name": "julia",
+      "version": "0.5.0"
+    },
+    "kernelspec": {
+      "name": "julia-0.5",
+      "display_name": "Julia 0.5.0",
+      "language": "julia"
+    }
+  },
+  "nbformat": 4
+}
diff --git a/test/documents/convert/chunk_options_nb.mdw.ref b/test/documents/convert/chunk_options_nb.mdw.ref
new file mode 100644
index 0000000..6ecd718
--- /dev/null
+++ b/test/documents/convert/chunk_options_nb.mdw.ref
@@ -0,0 +1,66 @@
+
+
+
+<<>>=
+y= [2, 5, 12]
+@
+
+
+
+<<>>=
+x = [12, 10]
+println(y)
+println(x)
+@
+
+
+
+<<>>=
+println("Results without code")
+println(x)
+@
+
+
+
+<<>>=
+y = randn(5)
+println("Don't eval, but show code")
+@
+
+
+
+<<>>=
+y = 1:5
+println(y)
+@
+
+
+
+<<>>=
+a = "Don't print me"
+println(a)
+@
+
+
+
+<<>>=
+println("No markup for results.")
+@
+
+Test wrapping:
+
+<<>>=
+println(collect(0:10:1000))
+@
+
+
+
+<<>>=
+println(collect(0:10:1000))
+@
+
+
+
+<<>>=
+println(collect(0:10:1000))
+@